(add-change-log-entry): Only expand-file-name if non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9385652c869aaaee63446a8a5fde1149533100aa..fd46f62195afcc86a03325fcdf6e2fd6e1d64c09 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-14  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * add-log.el (add-change-log-entry): Only expand-file-name if non-nil.
+
 2000-12-14  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * paths.el (Info-default-directory-list): If

diff --git a/lisp/add-log.el b/lisp/add-log.el
index e40b691f0649b9942a12575c06ad17a08045b730..3ba7c75738ef3d4b0e50c56d426b5412b0372329 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -432,10 +432,10 @@ non-nil, otherwise in local time."
   (let* ((defun (add-log-current-defun))
         (version (and change-log-version-info-enabled
                       (change-log-version-number-search)))
-        (buffer-file
-         (expand-file-name (if add-log-buffer-file-name-function
-                               (funcall add-log-buffer-file-name-function)
-                             buffer-file-name)))
+        (buf-file-name (if add-log-buffer-file-name-function
+                           (funcall add-log-buffer-file-name-function)
+                         buffer-file-name))
+        (buffer-file (if buf-file-name (expand-file-name buf-file-name)))
         (file-name (expand-file-name
                     (or file-name (find-change-log file-name buffer-file))))
         ;; Set ENTRY to the file name to use in the new entry.