procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(file-relative-name): Remove superfluous `and'.

Browse source 
Clarify docstring.  From Lars Hansen.
This commit is contained in:
Kai Großjohann 2003-03-31 16:05:50 +00:00
parent 2217b8e1e6
commit 493c98af4a
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2003-03-31 Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
* files.el (file-relative-name): Remove superfluous `and'.
Clarify docstring. From Lars Hansen.
2003-03-31 Kenichi Handa <handa@etlken2>
* international/utf-16.el (ccl-decode-mule-utf-16-le): Don't

45
lisp/files.el
View file

@ -2826,7 +2826,7 @@ Uses `backup-directory-alist' in the same way as does
This function returns a relative file name which is equivalent to FILENAME
when used with that default directory as the default.
If FILENAME and DIRECTORY lie on different machines or on different drives
\(DOS/Windows), it returns FILENAME in expanded form."
on a DOS/Windows machine, it returns FILENAME on expanded form."
(save-match-data
(setq directory
(file-name-as-directory (expand-file-name (or directory
@ -2836,28 +2836,27 @@ If FILENAME and DIRECTORY lie on different machines or on different drives
(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 (and
;; Conditions for separate trees
(or
;; Test for different drives on DOS/Windows
(and
(memq system-type '(ms-dos cygwin windows-nt))
(not (string-equal (substring filename 0 2)
(substring 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)))))))))
(if ;; Conditions for separate trees
(or
;; Test for different drives on DOS/Windows
(and
(memq system-type '(ms-dos cygwin windows-nt))
(not (string-equal (substring filename 0 2)
(substring 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
(unless (eq (aref filename 0) ?/)
(setq filename (concat "/" filename)))