# HG changeset patch # User Richard M. Stallman # Date 742100692 0 # Node ID e5cf0991893a96445548be9e7aa17bbf77d33731 # Parent 8bf916902edca97b538e9bdbd30e4c1f680f0068 (file-relative-name): If we use default-directory, call expand-file-name anyway. diff -r 8bf916902edc -r e5cf0991893a lisp/files.el --- a/lisp/files.el Wed Jul 07 22:21:19 1993 +0000 +++ b/lisp/files.el Thu Jul 08 03:04:52 1993 +0000 @@ -1321,9 +1321,8 @@ (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)