(add-log-file-name): Use file-relative-name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f50142089eb6a77107ad1d2d627da6e96e11ac2..a2caa435129563a9a3d8a03d044c927af8c0fd90 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * add-log.el (add-log-file-name): Use file-relative-name.
+
        * pcvs.el (cvs-mode-add-change-log-entry-other-window): Use a directory
        name for buffer-file-name if it refers to a directory.
 

diff --git a/lisp/add-log.el b/lisp/add-log.el
index 0ff82bba2f598be4bbc9209b78ffbe3ce6ca8052..1e7284514f19838b16b5a267e0bb9defc0b69a03 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -460,11 +460,7 @@ Optional arg BUFFER-FILE overrides `buffer-file-name'."
     (if add-log-file-name-function
        (funcall add-log-file-name-function buffer-file)
       (setq buffer-file
-           (if (string-match
-                (concat "^" (regexp-quote (file-name-directory log-file)))
-                buffer-file)
-               (substring buffer-file (match-end 0))
-             (file-name-nondirectory buffer-file)))
+            (file-relative-name buffer-file (file-name-directory log-file)))
       ;; If we have a backup file, it's presumably because we're
       ;; comparing old and new versions (e.g. for deleted
       ;; functions) and we'll want to use the original name.