Mercurial > emacs
changeset 46349:4f0aafa6b3bf
Do not hook into file-name-handler-alist, this
is done by Tramp.
| author | Kai Großjohann <kgrossjo@eu.uu.net> |
|---|---|
| date | Sat, 13 Jul 2002 18:08:11 +0000 |
| parents | 16e7539f3da5 |
| children | 9cead6e97a53 |
| files | lisp/ChangeLog lisp/net/ange-ftp.el |
| diffstat | 2 files changed, 33 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jul 13 18:03:55 2002 +0000 +++ b/lisp/ChangeLog Sat Jul 13 18:08:11 2002 +0000 @@ -1,5 +1,8 @@ 2002-07-13 Kai Gro,b_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + * net/ange-ftp.el: Do not hook into file-name-handler-alist, this + is done by Tramp. + * net/tramp.el (tramp-multi-file-name-structure-unified): Add missing slash and move colon from start to end of each hop. (tramp-multi-file-name-hop-structure-unified): Move colon from
--- a/lisp/net/ange-ftp.el Sat Jul 13 18:03:55 2002 +0000 +++ b/lisp/net/ange-ftp.el Sat Jul 13 18:08:11 2002 +0000 @@ -4343,33 +4343,36 @@ ;;; These file names are remote file names. (put 'ange-ftp-hook-function 'file-remote-p t) -;;; This regexp takes care of real ange-ftp file names (with a slash -;;; and colon). -;;; Don't allow the host name to end in a period--some systems use /.: -;;;###autoload -(or (assoc "^/[^/:]*[^/:.]:" file-name-handler-alist) - (setq file-name-handler-alist - (cons '("^/[^/:]*[^/:.]:" . ange-ftp-hook-function) - file-name-handler-alist))) - -;;; This regexp recognizes absolute filenames with only one component, -;;; for the sake of hostname completion. -;;;###autoload -(or (assoc "^/[^/:]*\\'" file-name-handler-alist) - (setq file-name-handler-alist - (cons '("^/[^/:]*\\'" . ange-ftp-completion-hook-function) - file-name-handler-alist))) - -;;; This regexp recognizes absolute filenames with only one component -;;; on Windows, for the sake of hostname completion. -;;; NB. Do not mark this as autoload, because it is very common to -;;; do completions in the root directory of drives on Windows. -(and (memq system-type '(ms-dos windows-nt)) - (or (assoc "^[a-zA-Z]:/[^/:]*\\'" file-name-handler-alist) - (setq file-name-handler-alist - (cons '("^[a-zA-Z]:/[^/:]*\\'" . - ange-ftp-completion-hook-function) - file-name-handler-alist)))) +;; The following code is commented out because Tramp now deals with +;; Ange-FTP filenames, too. + +;;-;;; This regexp takes care of real ange-ftp file names (with a slash +;;-;;; and colon). +;;-;;; Don't allow the host name to end in a period--some systems use /.: +;;-;;;###autoload +;;-(or (assoc "^/[^/:]*[^/:.]:" file-name-handler-alist) +;;- (setq file-name-handler-alist +;;- (cons '("^/[^/:]*[^/:.]:" . ange-ftp-hook-function) +;;- file-name-handler-alist))) +;;- +;;-;;; This regexp recognizes absolute filenames with only one component, +;;-;;; for the sake of hostname completion. +;;-;;;###autoload +;;-(or (assoc "^/[^/:]*\\'" file-name-handler-alist) +;;- (setq file-name-handler-alist +;;- (cons '("^/[^/:]*\\'" . ange-ftp-completion-hook-function) +;;- file-name-handler-alist))) +;;- +;;-;;; This regexp recognizes absolute filenames with only one component +;;-;;; on Windows, for the sake of hostname completion. +;;-;;; NB. Do not mark this as autoload, because it is very common to +;;-;;; do completions in the root directory of drives on Windows. +;;-(and (memq system-type '(ms-dos windows-nt)) +;;- (or (assoc "^[a-zA-Z]:/[^/:]*\\'" file-name-handler-alist) +;;- (setq file-name-handler-alist +;;- (cons '("^[a-zA-Z]:/[^/:]*\\'" . +;;- ange-ftp-completion-hook-function) +;;- file-name-handler-alist)))) ;;; The above two forms are sufficient to cause this file to be loaded ;;; if the user ever uses a file name with a colon in it.