diff options
| author | Michael Albinus | 2021-10-03 17:01:30 +0200 |
|---|---|---|
| committer | Michael Albinus | 2021-10-03 17:01:30 +0200 |
| commit | 17e6f3bee5a30f463082fad19d58de453ec9f490 (patch) | |
| tree | db69e560f45a57779f5062d40e7831cf63983cbf | |
| parent | 3dae1e33d19e2a7e0f879a38354944c9d567c9d3 (diff) | |
| download | emacs-17e6f3bee5a30f463082fad19d58de453ec9f490.tar.gz emacs-17e6f3bee5a30f463082fad19d58de453ec9f490.zip | |
; Fix last change in tramp-sshfs.el
| -rw-r--r-- | lisp/net/tramp-sshfs.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el index 688e408bfb0..68230ee1ffe 100644 --- a/lisp/net/tramp-sshfs.el +++ b/lisp/net/tramp-sshfs.el | |||
| @@ -222,12 +222,14 @@ arguments to pass to the OPERATION." | |||
| 222 | (defun tramp-sshfs-handle-insert-file-contents | 222 | (defun tramp-sshfs-handle-insert-file-contents |
| 223 | (filename &optional visit beg end replace) | 223 | (filename &optional visit beg end replace) |
| 224 | "Like `insert-file-contents' for Tramp files." | 224 | "Like `insert-file-contents' for Tramp files." |
| 225 | (let* (signal-hook-function | 225 | (setq filename (expand-file-name filename)) |
| 226 | (result | 226 | (let (signal-hook-function result) |
| 227 | (insert-file-contents | 227 | (unwind-protect |
| 228 | (tramp-fuse-local-file-name filename) visit beg end replace))) | 228 | (setq result |
| 229 | (when visit (setq buffer-file-name filename)) | 229 | (insert-file-contents |
| 230 | (cons (expand-file-name filename) (cdr result)))) | 230 | (tramp-fuse-local-file-name filename) visit beg end replace)) |
| 231 | (when visit (setq buffer-file-name filename)) | ||
| 232 | (cons filename (cdr result))))) | ||
| 231 | 233 | ||
| 232 | (defun tramp-sshfs-handle-process-file | 234 | (defun tramp-sshfs-handle-process-file |
| 233 | (program &optional infile destination display &rest args) | 235 | (program &optional infile destination display &rest args) |