[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c42959c: Fix byte-compiler warning in tramp-sh.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master c42959c: Fix byte-compiler warning in tramp-sh.el |
Date: |
Mon, 22 Jan 2018 09:08:07 -0500 (EST) |
branch: master
commit c42959cc206bcb52baffd45f892da1b767f0f8c1
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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.
---
lisp/net/tramp-sh.el | 2 +-
lisp/net/tramp.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 09d83dd..5ee8f93 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."
(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 d1100f0..d92d63c 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."
"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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master c42959c: Fix byte-compiler warning in tramp-sh.el,
Michael Albinus <=