diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-06-21 15:19:51 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-06-21 15:19:51 +0200 |
| commit | f18b035763785ffa9d8e27f3ec2be183b741502e (patch) | |
| tree | 8b07b6c4158d2ef319145952bd134d5ed1b65b16 /lisp/net/tramp.el | |
| parent | 1ecd350f38ee782cdebf4b08a59f2c1974ad44bd (diff) | |
| download | emacs-f18b035763785ffa9d8e27f3ec2be183b741502e.tar.gz emacs-f18b035763785ffa9d8e27f3ec2be183b741502e.tar.bz2 emacs-f18b035763785ffa9d8e27f3ec2be183b741502e.zip | |
Fix remaining problems with tramp-crypt.el
* lisp/net/tramp-compat.el (tramp-compat-make-temp-file):
Simplify implementation.
* lisp/net/tramp-crypt.el (tramp-crypt-handle-delete-file)
(tramp-crypt-handle-file-attributes, tramp-crypt-handle-file-system-info)
(tramp-crypt-handle-make-directory): Let-bind `tramp-crypt-enabled' to nil.
* lisp/net/tramp.el (tramp-file-name-for-operation): Fix for operations
with two arguments.
(tramp-handle-load): Suppress `signal-hook-function' when NOERROR
is non-nil.
* test/lisp/net/tramp-tests.el (tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip if needed.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1b50a6cf25b..1566162feaf 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2259,7 +2259,7 @@ Must be handled by the callers." file-newer-than-file-p rename-file)) (cond ((tramp-tramp-file-p (nth 0 args)) (nth 0 args)) - ((tramp-tramp-file-p (nth 1 args)) (nth 1 args)) + ((file-name-absolute-p (nth 1 args)) (nth 1 args)) (t default-directory))) ;; FILE DIRECTORY resp FILE1 FILE2. ((eq operation 'expand-file-name) @@ -3630,7 +3630,8 @@ User is always nil." v tramp-file-missing "Cannot load nonexistent file `%s'" file)) (if (not (file-exists-p file)) nil - (let ((inhibit-message nomessage)) + (let ((signal-hook-function (unless noerror signal-hook-function)) + (inhibit-message (or inhibit-message nomessage))) (with-tramp-progress-reporter v 0 (format "Loading %s" file) (let ((local-copy (file-local-copy file))) (unwind-protect |