procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve fix of debbugs:20634 in tramp-sh.el

Browse source
This commit is contained in:
Michael Albinus 2015-05-25 20:31:54 +02:00
parent ac59d53898
commit 175a07a132
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/net/tramp-sh.el
View file

@ -2129,9 +2129,10 @@ KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
(let ((coding-system-for-read 'binary)
(coding-system-for-write 'binary)
(jka-compr-inhibit t)
(inhibit-file-name-operation 'write-region)
(inhibit-file-name-handlers
(cons epa-file-handler
(remq 'tramp-file-name-handler inhibit-file-name-handlers))))
(cons 'epa-file-handler
(remq 'tramp-file-name-handler inhibit-file-name-handlers))))
(with-temp-file newname
(set-buffer-multibyte nil)
(insert-file-contents-literally filename)))
@ -3754,9 +3755,11 @@ Only send the definition if it has not already been done."
(tramp-get-connection-process vec) "scripts" (cons name scripts))))))
(defun tramp-set-auto-save ()
(when (and ;; ange-ftp has its own auto-save mechanism
(when (and ;; ange-ftp has its own auto-save mechanism.
(eq (tramp-find-foreign-file-name-handler (buffer-file-name))
'tramp-sh-file-name-handler)
;; epa has its own auto-save mechanism.
(not epa-file-inhibit-auto-save)
auto-save-default)
(auto-save-mode 1)))
(add-hook 'find-file-hooks 'tramp-set-auto-save t)