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

(file-relative-name): Protect the match-data.

Browse source
This commit is contained in:
Erik Naggum 1997-02-05 01:32:44 +00:00
parent 4fa073648d
commit 96c188b08c
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/files.el
View file

@ -1830,14 +1830,15 @@ If the value is nil, don't make a backup."
(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 (expand-file-name
(or directory default-directory))))
(let ((ancestor ""))
(while (not (string-match (concat "^" (regexp-quote directory)) filename))
(setq directory (file-name-directory (substring directory 0 -1))
ancestor (concat "../" ancestor)))
(concat ancestor (substring filename (match-end 0)))))
(save-match-data
(setq filename (expand-file-name filename)
directory (file-name-as-directory
(expand-file-name (or directory default-directory))))
(let ((ancestor ""))
(while (not (string-match (concat "^" (regexp-quote directory)) filename))
(setq directory (file-name-directory (substring directory 0 -1))
ancestor (concat "../" ancestor)))
(concat ancestor (substring filename (match-end 0))))))
(defun save-buffer (&optional args)
"Save current buffer in visited file if modified. Versions described below.