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

[Miles Bader]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.35.2.3 emacs/lisp/net/ange-ftp.el:1.35.2.4
*** emacs/lisp/net/ange-ftp.el:1.35.2.3 Thu Feb  5 14:48:34 2004
--- emacs/lisp/net/ange-ftp.el  Tue Jul  6 09:31:51 2004
***************
*** 4116,4121 ****
--- 4116,4124 ----
                                       (format "Getting %s" fn1))
          tmp1))))
  
+ (defun ange-ftp-file-remote-p (file)
+   (when (ange-ftp-ftp-name file) t))
+ 
  (defun ange-ftp-load (file &optional noerror nomessage nosuffix)
    (if (ange-ftp-ftp-name file)
        (let ((tryfiles (if nosuffix
***************
*** 4257,4265 ****
    (let ((fn (get operation 'ange-ftp)))
      (if fn (save-match-data (apply fn args))
        (ange-ftp-run-real-handler operation args))))
- ;;;###autoload
- ;;; 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.
--- 4260,4265 ----
***************
*** 4327,4332 ****
--- 4327,4333 ----
  (put 'file-name-completion 'ange-ftp 'ange-ftp-file-name-completion)
  (put 'insert-directory 'ange-ftp 'ange-ftp-insert-directory)
  (put 'file-local-copy 'ange-ftp 'ange-ftp-file-local-copy)
+ (put 'file-remote-p 'ange-ftp 'ange-ftp-file-remote-p)
  (put 'unhandled-file-name-directory 'ange-ftp
       'ange-ftp-unhandled-file-name-directory)
  (put 'file-name-sans-versions 'ange-ftp 'ange-ftp-file-name-sans-versions)