diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-12-17 18:52:23 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-12-17 18:52:23 +0100 |
| commit | ddff5d3d879d23f0684b8abe7d923fce4f86ec2e (patch) | |
| tree | 26369adf33fb81537e14d86a4d259436e855feae /lisp/net/tramp-sh.el | |
| parent | d428cc1b927ae1bf8240ed30b37c9418e819381d (diff) | |
| download | emacs-ddff5d3d879d23f0684b8abe7d923fce4f86ec2e.tar.gz emacs-ddff5d3d879d23f0684b8abe7d923fce4f86ec2e.tar.bz2 emacs-ddff5d3d879d23f0684b8abe7d923fce4f86ec2e.zip | |
Some minor Tramp changes
* doc/lispref/os.texi (Timers): Speak about `remote-file-error'.
* doc/misc/tramp.texi (Frequently Asked Questions): Speak about
`remote-file-error'.
(External packages): New subsection "Timers".
* lisp/net/tramp-adb.el (tramp-adb-handle-make-process):
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Adapt error
function. Handle coding.
* lisp/net/tramp.el (tramp-handle-make-process): Adapt error function.
Diffstat (limited to 'lisp/net/tramp-sh.el')
| -rw-r--r-- | lisp/net/tramp-sh.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f4a93c840cf..e30fe61de43 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2871,7 +2871,7 @@ implementation will be used." (unless (or (null sentinel) (functionp sentinel)) (signal 'wrong-type-argument (list #'functionp sentinel))) (unless (or (null stderr) (bufferp stderr) (stringp stderr)) - (signal 'wrong-type-argument (list #'stringp stderr))) + (signal 'wrong-type-argument (list #'bufferp stderr))) (when (and (stringp stderr) (tramp-tramp-file-p stderr) (not (tramp-equal-remote default-directory stderr))) (signal 'file-error (list "Wrong stderr" stderr))) @@ -2985,7 +2985,11 @@ implementation will be used." ;; `verify-visited-file-modtime'. (let ((buffer-undo-list t) (inhibit-read-only t) - (mark (point-max))) + (mark (point-max)) + (coding-system-for-write + (if (symbolp coding) coding (car coding))) + (coding-system-for-read + (if (symbolp coding) coding (cdr coding)))) (clear-visited-file-modtime) (narrow-to-region (point-max) (point-max)) ;; We call `tramp-maybe-open-connection', in @@ -6139,4 +6143,9 @@ function cell is returned to be applied on a buffer." ;; ;; * Implement `:stderr' of `make-process' as pipe process. +;; * One interesting solution (with other applications as well) would +;; be to stipulate, as a directory or connection-local variable, an +;; additional rc file on the remote machine that is sourced every +;; time Tramp connects. <https://emacs.stackexchange.com/questions/62306> + ;;; tramp-sh.el ends here |