diff options
| author | Kai Großjohann <kgrossjo@eu.uu.net> | 2004-06-13 16:48:44 +0000 |
|---|---|---|
| committer | Kai Großjohann <kgrossjo@eu.uu.net> | 2004-06-13 16:48:44 +0000 |
| commit | 6393ab2a792e545434e17bf7190815f6b64b6a2a (patch) | |
| tree | d45601ae35ec01d5c363dacdeca6e96e659d1766 /lisp | |
| parent | cea5d0d4234e3f208023e29873fdb199e0414749 (diff) | |
| download | emacs-6393ab2a792e545434e17bf7190815f6b64b6a2a.tar.gz | |
(diff-current-defun): If at start of hunk, use
position of first change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 10376008292..b810f87a565 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-06-13 Kai Grossjohann <kai.grossjohann@gmx.net> + + * diff-mode.el (diff-current-defun): If at start of hunk, use + position of first change. + 2004-06-13 Lars Hansen <larsh@math.ku.dk> * dired-x.el (dired-mark-omitted): Bind to "*O". 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 |