mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-24 14:30:43 -08:00
(file-relative-name): Don't lose when DIRECTORY is nil.
This commit is contained in:
parent
6c636af99b
commit
ea912aa694
1 changed files with 2 additions and 1 deletions
|
|
@ -940,7 +940,8 @@ Value is a list whose car is the name for the backup file
|
|||
(defun file-relative-name (filename &optional directory)
|
||||
"Convert FILENAME to be relative to DIRECTORY (default: default-directory)."
|
||||
(setq filename (expand-file-name filename)
|
||||
directory (file-name-as-directory (or (expand-file-name directory)
|
||||
directory (file-name-as-directory (if directory
|
||||
(expand-file-name directory)
|
||||
default-directory)))
|
||||
(while (not (string-match (concat "^" (regexp-quote directory)) filename))
|
||||
(setq directory (file-name-directory (substring directory 0 -1))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue