[Emacs-diffs] Changes to emacs/lisp/net/ange-ftp.el

[Kai Großjohann]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.39 emacs/lisp/net/ange-ftp.el:1.40
*** emacs/lisp/net/ange-ftp.el:1.39     Fri Jul 12 19:29:26 2002
--- emacs/lisp/net/ange-ftp.el  Sat Jul 13 14:08:11 2002
***************
*** 4343,4375 ****
  ;;; 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 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.
--- 4343,4378 ----
  ;;; These file names are remote file names.
  (put 'ange-ftp-hook-function 'file-remote-p t)
  
! ;; 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.