diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2019-07-12 15:05:55 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2019-07-12 15:05:55 +0200 |
commit | 9f76913184c900534fa17311ff5b1af747ff6264 (patch) | |
tree | 56f6511c74740377b4fc4cf3d8048ce06a1e9852 /lisp/net/tramp-smb.el | |
parent | 1d727e94b2da2387fe8cc379f6c95c677cbeacd6 (diff) | |
download | emacs-9f76913184c900534fa17311ff5b1af747ff6264.tar.gz emacs-9f76913184c900534fa17311ff5b1af747ff6264.tar.bz2 emacs-9f76913184c900534fa17311ff5b1af747ff6264.zip |
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.
Diffstat (limited to 'lisp/net/tramp-smb.el')
-rw-r--r-- | lisp/net/tramp-smb.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 695f552b061..099277d496a 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -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." |