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.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 09d83dd530036e326094224a095e3d09d179c8d2..5ee8f93870cf8c29c17cdd91712e93110a575279 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4118,7 +4118,7 @@ process to set up.  VEC specifies the connection."
                   (memq 'utf-8-hfs (coding-system-list)))
          (setq cs-decode 'utf-8-hfs
                cs-encode 'utf-8-hfs))
-       (set-buffer-process-coding-system cs-decode cs-encode)
+       (set-process-coding-system proc cs-decode cs-encode)
        (tramp-message
         vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
 

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d1100f0206eb1f3530fe1714e82404a728d4af1a..d92d63c67b0f0d1b3f100e16c6919496eadcfa71 100644 (file)
--- 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."
   "Default user to use for specific method/host pairs.
 This is an alist of items (METHOD HOST USER).  The first matching item
 specifies the user to use for a file name which does not specify a
-user.  METHOD and USER are regular expressions or nil, which is
+user.  METHOD and HOST are regular expressions or nil, which is
 interpreted as a regular expression which always matches.  If no entry
 matches, the variable `tramp-default-user' takes effect.
 
@@ -373,7 +373,7 @@ Useful for su and sudo methods mostly."
   "Default host to use for specific method/user pairs.
 This is an alist of items (METHOD USER HOST).  The first matching item
 specifies the host to use for a file name which does not specify a
-host.  METHOD and HOST are regular expressions or nil, which is
+host.  METHOD and USER are regular expressions or nil, which is
 interpreted as a regular expression which always matches.  If no entry
 matches, the variable `tramp-default-host' takes effect.