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

[Kai Großjohann]

Index: emacs/lisp/net/tramp-ftp.el
diff -c emacs/lisp/net/tramp-ftp.el:1.1 emacs/lisp/net/tramp-ftp.el:1.2
*** emacs/lisp/net/tramp-ftp.el:1.1     Thu Dec 26 15:47:51 2002
--- emacs/lisp/net/tramp-ftp.el Wed Feb  5 16:03:36 2003
***************
*** 1,6 ****
  ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP and EFS -*- 
coding: iso-8859-1; -*-
  
! ;; Copyright (C) 2002 Free Software Foundation, Inc.
  
  ;; Author: Michael Albinus <address@hidden>
  ;; Keywords: comm, processes
--- 1,6 ----
  ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP and EFS -*- 
coding: iso-8859-1; -*-
  
! ;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  
  ;; Author: Michael Albinus <address@hidden>
  ;; Keywords: comm, processes
***************
*** 25,31 ****
  ;;; Commentary:
  
  ;; Convenience functions for calling Ange-FTP (and maybe EFS, later on)
! ;; from Tramp. Most of them are displaced from tramp.el
  
  ;;; Code:
  
--- 25,31 ----
  ;;; Commentary:
  
  ;; Convenience functions for calling Ange-FTP (and maybe EFS, later on)
! ;; from Tramp.  Most of them are displaced from tramp.el.
  
  ;;; Code:
  
***************
*** 64,69 ****
--- 64,70 ----
      (setq file-name-handler-alist
          (delete a1 (delete a2 file-name-handler-alist)))))
  (tramp-disable-ange-ftp)
+ (eval-after-load "ange-ftp" '(tramp-disable-ange-ftp))
  
  ;; Define FTP method ...
  (defcustom tramp-ftp-method "ftp"
***************
*** 76,84 ****
  
  ;; Add some defaults for `tramp-default-method-alist'
  (add-to-list 'tramp-default-method-alist
!            '("\\`ftp\\." "" tramp-ftp-method))
  (add-to-list 'tramp-default-method-alist
!            '("" "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method))
  
  ;; Add completion function for FTP method.
  (unless (memq system-type '(windows-nt))
--- 77,85 ----
  
  ;; Add some defaults for `tramp-default-method-alist'
  (add-to-list 'tramp-default-method-alist
!            (list "\\`ftp\\." "" tramp-ftp-method))
  (add-to-list 'tramp-default-method-alist
!            (list "" "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method))
  
  ;; Add completion function for FTP method.
  (unless (memq system-type '(windows-nt))
***************
*** 92,99 ****
  pass to the OPERATION."
    (save-match-data
      (or (boundp 'ange-ftp-name-format)
!       (and (require 'ange-ftp)
!            (tramp-disable-ange-ftp)))
      (let* ((ange-ftp-name-format
            (list (nth 0 tramp-file-name-structure)
                  (nth 3 tramp-file-name-structure)
--- 93,99 ----
  pass to the OPERATION."
    (save-match-data
      (or (boundp 'ange-ftp-name-format)
!       (require 'ange-ftp))
      (let* ((ange-ftp-name-format
            (list (nth 0 tramp-file-name-structure)
                  (nth 3 tramp-file-name-structure)