[Emacs-diffs] Changes to emacs/lisp/files.el

[Michael Albinus]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.698 emacs/lisp/files.el:1.699
*** emacs/lisp/files.el:1.698   Sat May 29 01:51:59 2004
--- emacs/lisp/files.el Sat May 29 22:42:06 2004
***************
*** 642,650 ****
  
  (defun file-remote-p (file)
    "Test whether FILE specifies a location on a remote system."
!   (let ((handler (find-file-name-handler file 'file-local-copy)))
      (if handler
!       (get handler 'file-remote-p))))
  
  (defun file-local-copy (file)
    "Copy the file FILE into a temporary file on this machine.
--- 642,651 ----
  
  (defun file-remote-p (file)
    "Test whether FILE specifies a location on a remote system."
!   (let ((handler (find-file-name-handler file 'file-remote-p)))
      (if handler
!       (funcall handler 'file-remote-p file)
!       nil)))
  
  (defun file-local-copy (file)
    "Copy the file FILE into a temporary file on this machine.
***************
*** 2903,2912 ****
          (file-name-as-directory (expand-file-name (or directory
                                                        default-directory))))
      (setq filename (expand-file-name filename))
!     (let ((hf (find-file-name-handler filename 'file-local-copy))
!           (hd (find-file-name-handler directory 'file-local-copy)))
!       (when (and hf (not (get hf 'file-remote-p))) (setq hf nil))
!       (when (and hd (not (get hd 'file-remote-p))) (setq hd nil))
        (if ;; Conditions for separate trees
          (or
           ;; Test for different drives on DOS/Windows
--- 2904,2911 ----
          (file-name-as-directory (expand-file-name (or directory
                                                        default-directory))))
      (setq filename (expand-file-name filename))
!     (let ((hf (find-file-name-handler filename 'file-remote-p))
!           (hd (find-file-name-handler directory 'file-remote-p)))
        (if ;; Conditions for separate trees
          (or
           ;; Test for different drives on DOS/Windows