aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-01-22 15:07:56 +0100
committerMichael Albinus2018-01-22 15:07:56 +0100
commitc42959cc206bcb52baffd45f892da1b767f0f8c1 (patch)
treef704f501df38b8d466d2467cbd5a9b6aa2490993
parentd0fd9809d7574c67a181225fcc1c59afdbb1295c (diff)
downloademacs-c42959cc206bcb52baffd45f892da1b767f0f8c1.tar.gz
emacs-c42959cc206bcb52baffd45f892da1b767f0f8c1.zip
Fix byte-compiler warning in tramp-sh.el
* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): Use `set-process-coding-system' rather than interactive `set-buffer-process-coding-system'. * lisp/net/tramp.el (tramp-default-user-alist) (tramp-default-host-alist): Fix docstring.
-rw-r--r--lisp/net/tramp-sh.el2
-rw-r--r--lisp/net/tramp.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 09d83dd5300..5ee8f93870c 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4118,7 +4118,7 @@ process to set up. VEC specifies the connection."
4118 (memq 'utf-8-hfs (coding-system-list))) 4118 (memq 'utf-8-hfs (coding-system-list)))
4119 (setq cs-decode 'utf-8-hfs 4119 (setq cs-decode 'utf-8-hfs
4120 cs-encode 'utf-8-hfs)) 4120 cs-encode 'utf-8-hfs))
4121 (set-buffer-process-coding-system cs-decode cs-encode) 4121 (set-process-coding-system proc cs-decode cs-encode)
4122 (tramp-message 4122 (tramp-message
4123 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode))) 4123 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
4124 4124
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d1100f0206e..d92d63c67b0 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -349,7 +349,7 @@ This variable is regarded as obsolete, and will be removed soon."
349 "Default user to use for specific method/host pairs. 349 "Default user to use for specific method/host pairs.
350This is an alist of items (METHOD HOST USER). The first matching item 350This is an alist of items (METHOD HOST USER). The first matching item
351specifies the user to use for a file name which does not specify a 351specifies the user to use for a file name which does not specify a
352user. METHOD and USER are regular expressions or nil, which is 352user. METHOD and HOST are regular expressions or nil, which is
353interpreted as a regular expression which always matches. If no entry 353interpreted as a regular expression which always matches. If no entry
354matches, the variable `tramp-default-user' takes effect. 354matches, the variable `tramp-default-user' takes effect.
355 355
@@ -373,7 +373,7 @@ Useful for su and sudo methods mostly."
373 "Default host to use for specific method/user pairs. 373 "Default host to use for specific method/user pairs.
374This is an alist of items (METHOD USER HOST). The first matching item 374This is an alist of items (METHOD USER HOST). The first matching item
375specifies the host to use for a file name which does not specify a 375specifies the host to use for a file name which does not specify a
376host. METHOD and HOST are regular expressions or nil, which is 376host. METHOD and USER are regular expressions or nil, which is
377interpreted as a regular expression which always matches. If no entry 377interpreted as a regular expression which always matches. If no entry
378matches, the variable `tramp-default-host' takes effect. 378matches, the variable `tramp-default-host' takes effect.
379 379