(diff-current-defun): Force recomputation of change-log-default-name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb4d73ecf612f15211ea55b6f4a4360b0ec36e68..bd796c99f4aefbfead0e2b8fc26ee0a44c30ae8d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * diff-mode.el (diff-current-defun): Force recomputation of
+       change-log-default-name.
+
 2007-10-12  Chong Yidong  <cyd@stupidchicken.com>
 
        * startup.el (fancy-startup-screen): Remove an unnecessary newline
@@ -54,10 +59,9 @@
 
 2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-       * vc.el (vc-diff):
-       (vc-diff-internal): Bug fixes by Juanma Barranquero.  Temporarily
-       disable the check for his edge case, it's calling some brittle
-       code.
+       * vc.el (vc-diff, vc-diff-internal): Bug fixes by Juanma Barranquero.
+       Temporarily disable the check for his edge case, it's calling some
+       brittle code.
        (with-vc-properties): Fievaluation time of a macro argument.
 
        * ediff-vers.el (ediff-vc-internal):
@@ -193,8 +197,7 @@
        * vc-mtn.el:
        * vc-rcs.el:
        * vc-sccs.el:
-       * vc-svn.el: Terminology cleanup: workfile-version ->
-       working-revision,
+       * vc-svn.el: Terminology cleanup: workfile-version -> working-revision,
        {find,init,next,previous,annotate-*,log}-version ->
        {find,init,next,previous,annotate-*,log}-revision,
        annotate-focus-version -> annotate-working-revision, The term

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 609c5ef64904bc50ebd2b6318a99198c5e6d4fc0..229ef227777e83409ba20e39aebc42c29ab1b40a 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1578,6 +1578,10 @@ then `diff-jump-to-old-file' is also set, for the next invocations."
 (defun diff-current-defun ()
   "Find the name of function at point.
 For use in `add-log-current-defun-function'."
+  ;; Kill change-log-default-name so it gets recomputed each time, since
+  ;; each hunk may belong to another file which may belong to another
+  ;; directory and hence have a different ChangeLog file.
+  (kill-local-variable 'change-log-default-name)
   (save-excursion
     (when (looking-at diff-hunk-header-re)
       (forward-line 1)