diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-07-08 03:04:52 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-07-08 03:04:52 +0000 |
| commit | 77fb6aed82fed34237e6f52c8f65b0641010ca2c (patch) | |
| tree | 54bd5ae7792783fa4b4d0ff5c129cf49782e9147 /lisp | |
| parent | fe3371ef58ce66ebedc4424d506afaef51ab7467 (diff) | |
| download | emacs-77fb6aed82fed34237e6f52c8f65b0641010ca2c.tar.gz emacs-77fb6aed82fed34237e6f52c8f65b0641010ca2c.tar.bz2 emacs-77fb6aed82fed34237e6f52c8f65b0641010ca2c.zip | |
(file-relative-name): If we use default-directory,
call expand-file-name anyway.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/files.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index 62210737189..38fc1fc3cdf 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1321,9 +1321,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 (if directory - (expand-file-name directory) - default-directory))) + directory (file-name-as-directory (expand-file-name + (or directory default-directory)))) (file-relative-name-1 directory)) (defun save-buffer (&optional args) |