comparison 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
comparison
equal deleted inserted replaced
90795:b9182b6a90c9 90796:4ef881a120fe
4420 (if fn 4420 (if fn
4421 (save-match-data (apply (cdr fn) args)) 4421 (save-match-data (apply (cdr fn) args))
4422 (tramp-completion-run-real-handler operation args))))) 4422 (tramp-completion-run-real-handler operation args)))))
4423 4423
4424 ;;;###autoload 4424 ;;;###autoload
4425 (defsubst tramp-register-file-name-handlers () 4425 (defsubst tramp-register-file-name-handler ()
4426 "Add tramp file name handlers to `file-name-handler-alist'." 4426 "Add tramp file name handler to `file-name-handler-alist'."
4427 (add-to-list 'file-name-handler-alist 4427 (add-to-list 'file-name-handler-alist
4428 (cons tramp-file-name-regexp 'tramp-file-name-handler)) 4428 (cons tramp-file-name-regexp 'tramp-file-name-handler))
4429 ;; If jka-compr is already loaded, move it to the front of
4430 ;; `file-name-handler-alist'.
4431 (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist)))
4432 (when jka
4433 (setq file-name-handler-alist
4434 (cons jka (delete jka file-name-handler-alist))))))
4435
4436 ;;;###autoload
4437 (defsubst tramp-register-completion-file-name-handler ()
4438 "Add tramp completion file name handler to `file-name-handler-alist'."
4429 ;; `partial-completion-mode' is unknown in XEmacs. So we should 4439 ;; `partial-completion-mode' is unknown in XEmacs. So we should
4430 ;; load it unconditionally there. In the GNU Emacs case, method/ 4440 ;; load it unconditionally there. In the GNU Emacs case, method/
4431 ;; user/host name completion shall be bound to `partial-completion-mode'. 4441 ;; user/host name completion shall be bound to `partial-completion-mode'.
4432 (when (or (not (boundp 'partial-completion-mode)) 4442 (when (or (not (boundp 'partial-completion-mode))
4433 (symbol-value 'partial-completion-mode) 4443 (symbol-value 'partial-completion-mode)
4441 (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist))) 4451 (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist)))
4442 (when jka 4452 (when jka
4443 (setq file-name-handler-alist 4453 (setq file-name-handler-alist
4444 (cons jka (delete jka file-name-handler-alist)))))) 4454 (cons jka (delete jka file-name-handler-alist))))))
4445 4455
4456 ;; `tramp-file-name-handler' must be registered before evaluation of
4457 ;; site-start and init files, because there might exist remote files
4458 ;; already, f.e. files kept via recentf-mode.
4459 ;;;###autoload(tramp-register-file-name-handler)
4446 ;; During autoload, it shall be checked whether 4460 ;; During autoload, it shall be checked whether
4447 ;; `partial-completion-mode' is active. Therefore registering will be 4461 ;; `partial-completion-mode' is active. Therefore registering of
4448 ;; delayed. 4462 ;; `tramp-completion-file-name-handler' will be delayed.
4449 ;;;###autoload(add-hook 4463 ;;;###autoload(add-hook
4450 ;;;###autoload 'after-init-hook 4464 ;;;###autoload 'after-init-hook
4451 ;;;###autoload '(lambda () (tramp-register-file-name-handlers))) 4465 ;;;###autoload '(lambda () (tramp-register-completion-file-name-handler)))
4452 (tramp-register-file-name-handlers) 4466 (tramp-register-file-name-handler)
4467 (tramp-register-completion-file-name-handler)
4453 4468
4454 ;;;###autoload 4469 ;;;###autoload
4455 (defun tramp-unload-file-name-handlers () 4470 (defun tramp-unload-file-name-handlers ()
4456 (setq file-name-handler-alist 4471 (setq file-name-handler-alist
4457 (delete (rassoc 'tramp-file-name-handler 4472 (delete (rassoc 'tramp-file-name-handler