summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/add-log.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9385652c869..fd46f62195a 100644
--- 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 e40b691f064..3ba7c75738e 100644
--- 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.