(file-relative-name): If we use default-directory,

call expand-file-name anyway.

diff --git a/lisp/files.el b/lisp/files.el
index 6221073718969be75954b665619f4345fe03093f..38fc1fc3cdf7f2b85d2f66caa5c59ae550ebc7e9 100644 (file)
--- 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))
 \f
 (defun save-buffer (&optional args)