(diff-current-defun): If at start of hunk, use

position of first change.

1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 9b00eae050d..3e6d1b7ac57 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1248,9 +1248,12 @@ If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[u
 (defun diff-current-defun ()
   "Find the name of function at point.
 For use in `add-log-current-defun-function'."
+    (save-excursion
+      (when (looking-at diff-hunk-header-re)
+        (forward-line 1)
+        (while (and (looking-at " ") (not (zerop (forward-line 1))))))
   (destructuring-bind (buf line-offset pos src dst &optional switched)
       (diff-find-source-location)
-    (save-excursion
       (beginning-of-line)
       (or (when (memq (char-after) '(?< ?-))
             ;; Cursor is pointing at removed text.  This could be a removed