Re-add tramp-autoload cookie for all defcustoms
* lisp/net/tramp-adb.el (tramp-adb-program) (tramp-adb-connect-if-not-connected, tramp-adb-prompt): * lisp/net/tramp-cache.el (tramp-persistency-file-name): * lisp/net/tramp-gvfs.el (tramp-gvfs-zeroconf-domain): * lisp/net/tramp-rclone.el (tramp-rclone-program): * lisp/net/tramp-sh.el (tramp-copy-size-limit, tramp-histfile-override) (tramp-use-ssh-controlmaster-options): * lisp/net/tramp-smb.el (tramp-smb-program, tramp-smb-acl-program) (tramp-smb-conf, tramp-smb-winexe-program) (tramp-smb-winexe-shell-command) (tramp-smb-winexe-shell-command-switch): Re-add tramp-autoload cookie for all defcustoms. * lisp/net/tramp-adb.el (tramp-adb-handle-copy-file) (tramp-adb-handle-rename-file): * lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file): * lisp/net/tramp-rclone.el (tramp-rclone-do-copy-or-rename-file): * lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file): * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-rename-file): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file): Check, that NEWNAME is not a directory given as file name.
This commit is contained in:
parent
1d727e94b2
commit
9f76913184
6 changed files with 16 additions and 0 deletions
|
@ -35,12 +35,14 @@
|
|||
|
||||
(require 'tramp)
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-adb-program "adb"
|
||||
"Name of the Android Debug Bridge program."
|
||||
:group 'tramp
|
||||
:version "24.4"
|
||||
:type 'string)
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-adb-connect-if-not-connected nil
|
||||
"Try to run `adb connect' if provided device is not connected currently.
|
||||
It is used for TCP/IP devices."
|
||||
|
@ -52,6 +54,7 @@ It is used for TCP/IP devices."
|
|||
(defconst tramp-adb-method "adb"
|
||||
"When this method name is used, forward all calls to Android Debug Bridge.")
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-adb-prompt
|
||||
"^[[:digit:]]*|?[[:alnum:]\e;[]*@?[[:alnum:]]*[^#\\$]*[#\\$][[:space:]]"
|
||||
"Regexp used as prompt in almquist shell."
|
||||
|
|
|
@ -86,6 +86,7 @@ details see the info pages."
|
|||
(choice :tag " Property" string)
|
||||
(choice :tag " Value" sexp))))
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-persistency-file-name
|
||||
(expand-file-name (locate-user-emacs-file "tramp"))
|
||||
"File which keeps connection history for Tramp connections."
|
||||
|
|
|
@ -161,6 +161,7 @@
|
|||
(add-to-list 'tramp-default-host-alist
|
||||
'("\\`gdrive\\'" nil ,(match-string 2 user-mail-address)))))
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-gvfs-zeroconf-domain "local"
|
||||
"Zeroconf domain to be used for discovering services, like host names."
|
||||
:group 'tramp
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
(defconst tramp-rclone-method "rclone"
|
||||
"When this method name is used, forward all calls to rclone mounts.")
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-rclone-program "rclone"
|
||||
"Name of the rclone program."
|
||||
:group 'tramp
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
(defvar vc-git-program)
|
||||
(defvar vc-hg-program)
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-inline-compress-start-size 4096
|
||||
"The minimum size of compressing where inline transfer.
|
||||
When inline transfer, compress transferred data of file
|
||||
|
@ -45,6 +46,7 @@ If it is nil, no compression at all will be applied."
|
|||
:group 'tramp
|
||||
:type '(choice (const nil) integer))
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-copy-size-limit 10240
|
||||
"The maximum file size where inline copying is preferred over an \
|
||||
out-of-the-band copy.
|
||||
|
@ -61,6 +63,7 @@ files conditionalize this setup based on the TERM environment variable."
|
|||
:group 'tramp
|
||||
:type 'string)
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-histfile-override "~/.tramp_history"
|
||||
"When invoking a shell, override the HISTFILE with this value.
|
||||
When setting to a string, it redirects the shell history to that
|
||||
|
@ -103,6 +106,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
|
|||
(defconst tramp-end-of-heredoc (md5 tramp-end-of-output)
|
||||
"String used to recognize end of heredoc strings.")
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-use-ssh-controlmaster-options t
|
||||
"Whether to use `tramp-ssh-controlmaster-options'."
|
||||
:group 'tramp
|
||||
|
|
|
@ -60,17 +60,20 @@
|
|||
tramp-smb-method
|
||||
'((tramp-parse-netrc "~/.netrc"))))
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-smb-program "smbclient"
|
||||
"Name of SMB client to run."
|
||||
:group 'tramp
|
||||
:type 'string)
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-smb-acl-program "smbcacls"
|
||||
"Name of SMB acls to run."
|
||||
:group 'tramp
|
||||
:type 'string
|
||||
:version "24.4")
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-smb-conf "/dev/null"
|
||||
"Path of the smb.conf file.
|
||||
If it is nil, no smb.conf will be added to the `tramp-smb-program'
|
||||
|
@ -287,6 +290,7 @@ See `tramp-actions-before-shell' for more info.")
|
|||
Operations not mentioned here will be handled by the default Emacs primitives.")
|
||||
|
||||
;; Options for remote processes via winexe.
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-smb-winexe-program "winexe"
|
||||
"Name of winexe client to run.
|
||||
If it isn't found in the local $PATH, the absolute path of winexe
|
||||
|
@ -295,6 +299,7 @@ shall be given. This is needed for remote processes."
|
|||
:type 'string
|
||||
:version "24.3")
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-smb-winexe-shell-command "powershell.exe"
|
||||
"Shell to be used for processes on remote machines.
|
||||
This must be Powershell V2 compatible."
|
||||
|
@ -302,6 +307,7 @@ This must be Powershell V2 compatible."
|
|||
:type 'string
|
||||
:version "24.3")
|
||||
|
||||
;;;###tramp-autoload
|
||||
(defcustom tramp-smb-winexe-shell-command-switch "-file -"
|
||||
"Command switch used together with `tramp-smb-winexe-shell-command'.
|
||||
This can be used to disable echo etc."
|
||||
|
|
Loading…
Add table
Reference in a new issue