Mercurial > emacs
changeset 106959:5071660bbec4
* net/tramp-smb.el (tramp-smb-conf): New defcustom.
(tramp-smb-maybe-open-connection): Use it.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sat, 23 Jan 2010 12:02:28 +0100 |
| parents | 9a7965a5cdaf |
| children | a9aa0a1b1492 365134ccde58 |
| files | lisp/ChangeLog lisp/net/tramp-smb.el |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 23 14:20:38 2010 +0900 +++ b/lisp/ChangeLog Sat Jan 23 12:02:28 2010 +0100 @@ -1,6 +1,11 @@ +2010-01-23 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp-smb.el (tramp-smb-conf): New defcustom. + (tramp-smb-maybe-open-connection): Use it. + 2010-01-22 Michael Albinus <michael.albinus@gmx.de> - * net/tramp-imap.el (top): Autoload needed packages. + * net/tramp-imap.el (top): Autoload needed packages. (Bug#5448) 2010-01-22 Stefan Monnier <monnier@iro.umontreal.ca>
--- a/lisp/net/tramp-smb.el Sat Jan 23 14:20:38 2010 +0900 +++ b/lisp/net/tramp-smb.el Sat Jan 23 12:02:28 2010 +0100 @@ -61,6 +61,13 @@ :group 'tramp :type 'string) +(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' +call, letting the SMB client use the default one." + :group 'tramp + :type '(choice (const nil) (file :must-match t))) + (defvar tramp-smb-version nil "*Version string of the SMB client.") @@ -1281,7 +1288,8 @@ (when domain (setq args (append args (list "-W" domain)))) (when port (setq args (append args (list "-p" port)))) - (setq args (append args (list "-s" "/dev/null"))) + (when tramp-smb-conf + (setq args (append args (list "-s" tramp-smb-conf)))) ;; OK, let's go. (tramp-message