comparison lisp/files.el @ 56259:ed6c2f79cef5

* net/ange-ftp.el (ange-ftp-file-remote-p): New return value, according to new documentation of `file-remote-p'. * files.el (file-remote-p): Fix doc to say that return value is identification of remote system, if not nil. (file-relative-name): Use new return value of `file-remote-p'.

56258:3b1880995ace

			  'locate-file-completion
			  (cons load-path load-suffixes))))
  (load library))

(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)))

  (save-match-data
    (setq directory
	  (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
	   (and
	    ;; Should `cygwin' really be included here?  --stef
	    (memq system-type '(ms-dos cygwin windows-nt))
	    (not (eq t (compare-strings filename 0 2 directory 0 2))))
	   ;; Test for different remote file handlers
	   (not (eq hf hd))
	   ;; Test for different remote file system identification
	   (and
	    hf
	    (let ((re (car (rassq hf file-name-handler-alist))))
	      (not
	       (equal
		(and
		 (string-match re filename)
		 (substring filename 0 (match-end 0)))
		(and
		 (string-match re directory)
		 (substring directory 0 (match-end 0))))))))
	  filename
        (let ((ancestor ".")
	      (filename-dir (file-name-as-directory filename)))
          (while (not
		  (or

56259:ed6c2f79cef5

			  'locate-file-completion
			  (cons load-path load-suffixes))))
  (load library))

(defun file-remote-p (file)
  "Test whether FILE specifies a location on a remote system.
Return an identification of the system if the location is indeed
remote.  The identification of the system may comprise a method
to access the system and its hostname, amongst other things.

For example, the filename \"/user@host:/foo\" specifies a location
on the system \"/user@host:\"."
  (let ((handler (find-file-name-handler file 'file-remote-p)))
    (if handler
	(funcall handler 'file-remote-p file)
      nil)))

  (save-match-data
    (setq directory
	  (file-name-as-directory (expand-file-name (or directory
							default-directory))))
    (setq filename (expand-file-name filename))
    (let ((fremote (file-remote-p filename))
          (dremote (file-remote-p directory)))
      (if ;; Conditions for separate trees
	  (or
	   ;; Test for different drives on DOS/Windows
	   (and
	    ;; Should `cygwin' really be included here?  --stef
	    (memq system-type '(ms-dos cygwin windows-nt))
	    (not (eq t (compare-strings filename 0 2 directory 0 2))))
	   ;; Test for different remote file system identification
	   (not (equal fremote dremote)))
	  filename
        (let ((ancestor ".")
	      (filename-dir (file-name-as-directory filename)))
          (while (not
		  (or