[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el |
Date: |
Wed, 31 Aug 2005 16:28:51 -0400 |
Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.74 emacs/lisp/net/tramp.el:1.75
*** emacs/lisp/net/tramp.el:1.74 Wed Aug 31 09:01:52 2005
--- emacs/lisp/net/tramp.el Wed Aug 31 20:28:48 2005
***************
*** 3829,3840 ****
("]" . "_r"))
(buffer-file-name))
tramp-auto-save-directory)
! (buffer-file-name)))
! ;; We set it to nil because `make-auto-save-file-name' shouldn't
! ;; recurse infinitely.
! tramp-auto-save-directory)
! (tramp-run-real-handler
! 'make-auto-save-file-name nil)))
;; CCC grok APPEND, LOCKNAME, CONFIRM
--- 3829,3847 ----
("]" . "_r"))
(buffer-file-name))
tramp-auto-save-directory)
! (buffer-file-name))))
! ;; Run plain `make-auto-save-file-name'. There might be an advice when
! ;; it is not a magic file name operation (since Emacs 22).
! ;; We must deactivate it temporarily.
! (if (not (ad-is-active 'make-auto-save-file-name))
! (tramp-run-real-handler
! 'make-auto-save-file-name nil)
! ;; else
! (ad-deactivate 'make-auto-save-file-name)
! (prog1
! (tramp-run-real-handler
! 'make-auto-save-file-name nil)
! (ad-activate 'make-auto-save-file-name)))))
;; CCC grok APPEND, LOCKNAME, CONFIRM
***************
*** 6935,6950 ****
;; Auto saving to a special directory.
! (defun tramp-exists-file-name-handler (operation)
! (let ((file-name-handler-alist (list (cons "/" 'identity))))
! (eq (find-file-name-handler "/" operation) 'identity)))
(unless (tramp-exists-file-name-handler 'make-auto-save-file-name)
(defadvice make-auto-save-file-name
(around tramp-advice-make-auto-save-file-name () activate)
"Invoke `tramp-handle-make-auto-save-file-name' for tramp files."
(if (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name)))
! (setq ad-return-value (tramp-make-auto-save-file-name))
ad-do-it)))
;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have
--- 6942,6968 ----
;; Auto saving to a special directory.
! (defun tramp-exists-file-name-handler (operation &rest args)
! (let ((buffer-file-name "/")
! (fnha file-name-handler-alist)
! (check-file-name-operation operation)
! (file-name-handler-alist
! (list
! (cons "/"
! '(lambda (operation &rest args)
! "Returns OPERATION if it is the one to be checked"
! (if (equal check-file-name-operation operation)
! operation
! (let ((file-name-handler-alist fnha))
! (apply operation args))))))))
! (eq (apply operation args) operation)))
(unless (tramp-exists-file-name-handler 'make-auto-save-file-name)
(defadvice make-auto-save-file-name
(around tramp-advice-make-auto-save-file-name () activate)
"Invoke `tramp-handle-make-auto-save-file-name' for tramp files."
(if (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name)))
! (setq ad-return-value (tramp-handle-make-auto-save-file-name))
ad-do-it)))
;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have