Mercurial > emacs
diff lisp/net/tramp.el @ 90796:4ef881a120fe
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 11 Apr 2007 00:17:47 +0000 |
parents | 91bf6e05918b d55ab93ab5bf |
children | 648e6c714c7d |
line wrap: on
line diff
--- a/lisp/net/tramp.el Fri Mar 30 02:06:58 2007 +0000 +++ b/lisp/net/tramp.el Wed Apr 11 00:17:47 2007 +0000 @@ -4422,10 +4422,20 @@ (tramp-completion-run-real-handler operation args))))) ;;;###autoload -(defsubst tramp-register-file-name-handlers () - "Add tramp file name handlers to `file-name-handler-alist'." +(defsubst tramp-register-file-name-handler () + "Add tramp file name handler to `file-name-handler-alist'." (add-to-list 'file-name-handler-alist (cons tramp-file-name-regexp 'tramp-file-name-handler)) + ;; If jka-compr is already loaded, move it to the front of + ;; `file-name-handler-alist'. + (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist))) + (when jka + (setq file-name-handler-alist + (cons jka (delete jka file-name-handler-alist)))))) + +;;;###autoload +(defsubst tramp-register-completion-file-name-handler () + "Add tramp completion file name handler to `file-name-handler-alist'." ;; `partial-completion-mode' is unknown in XEmacs. So we should ;; load it unconditionally there. In the GNU Emacs case, method/ ;; user/host name completion shall be bound to `partial-completion-mode'. @@ -4443,13 +4453,18 @@ (setq file-name-handler-alist (cons jka (delete jka file-name-handler-alist)))))) +;; `tramp-file-name-handler' must be registered before evaluation of +;; site-start and init files, because there might exist remote files +;; already, f.e. files kept via recentf-mode. +;;;###autoload(tramp-register-file-name-handler) ;; During autoload, it shall be checked whether -;; `partial-completion-mode' is active. Therefore registering will be -;; delayed. +;; `partial-completion-mode' is active. Therefore registering of +;; `tramp-completion-file-name-handler' will be delayed. ;;;###autoload(add-hook ;;;###autoload 'after-init-hook -;;;###autoload '(lambda () (tramp-register-file-name-handlers))) -(tramp-register-file-name-handlers) +;;;###autoload '(lambda () (tramp-register-completion-file-name-handler))) +(tramp-register-file-name-handler) +(tramp-register-completion-file-name-handler) ;;;###autoload (defun tramp-unload-file-name-handlers ()