diff options
Diffstat (limited to 'lisp/net')
-rw-r--r-- | lisp/net/tramp-compat.el | 2 | ||||
-rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
-rw-r--r-- | lisp/net/tramp.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 5054f1d232..89c7db241d 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -412,7 +412,7 @@ element is not omitted." (program &optional infile destination display &rest args) "Calls `call-process' on the local host. This is needed because for some Emacs flavors Tramp has -defadviced `call-process' to behave like `process-file'. The +defadvised `call-process' to behave like `process-file'. The Lisp error raised when PROGRAM is nil is trapped also, returning 1." (let ((default-directory (if (file-remote-p default-directory) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1b00e81ef5..50a3c1fca5 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -549,7 +549,7 @@ as given in your `~/.profile'." "*List of environment variables to be set on the remote host. Each element should be a string of the form ENVVARNAME=VALUE. An -entry ENVVARNAME= diables the corresponding environment variable, +entry ENVVARNAME= disables the corresponding environment variable, which might have been set in the init files like ~/.profile. Special handling is applied to the PATH environment, which should diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a47e7fa8f6..0ee6ad8dea 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should choose a shell here which groks tilde expansion. `/bin/sh' normally does not understand tilde expansion. -For encoding and deocding, commands like the following are executed: +For encoding and decoding, commands like the following are executed: /bin/sh -c COMMAND < INPUT > OUTPUT |