Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0536254e
Commit
0536254e
authored
Jan 23, 2010
by
Michael Albinus
Browse files
* net/tramp-smb.el (tramp-smb-conf): New defcustom.
(tramp-smb-maybe-open-connection): Use it.
parent
3d782998
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
lisp/ChangeLog
lisp/ChangeLog
+6
-1
lisp/net/tramp-smb.el
lisp/net/tramp-smb.el
+9
-1
No files found.
lisp/ChangeLog
View file @
0536254e
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>
...
...
lisp/net/tramp-smb.el
View file @
0536254e
...
...
@@ -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 @@ connection if a previous connection has died for some reason."
(
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment