diff options
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index bf6b5cf4895..6e82b63581a 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1750,7 +1750,14 @@ I.e. like `add-change-log-entry-other-window' but applied to all hunks." ;; Move to where the changes are, ;; `add-change-log-entry-other-window' works better in ;; that case. - (re-search-forward "\n[!+-<>]" nil t)) + (re-search-forward + (concat "\n[!+-<>]" + ;; If the hunk is a context hunk with an empty first + ;; half, recognize the "--- NNN,MMM ----" line + "\\(-- [0-9]+\\(,[0-9]+\\)? ----\n" + ;; and skip to the next non-context line. + "\\( .*\n\\)*[+]\\)?") + nil t)) (save-excursion (add-change-log-entry-other-window) ;; Insert a "." so that the entries created don't get |