From f4d79bd021831eb64e1bfc7f5c5b1ddb2138b37a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 19 Dec 2012 14:41:43 -0500 Subject: [PATCH] * lisp/vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the very beginning of a hunk (e.g. killing the first line). --- lisp/ChangeLog | 5 +++++ lisp/vc/diff-mode.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8e16fe02d9c..3fd8b363546 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-12-19 Stefan Monnier + + * vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the + very beginning of a hunk (e.g. killing the first line). + 2012-12-19 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 0c023b0f7f4..edd209a7910 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1298,7 +1298,7 @@ See `after-change-functions' for the meaning of BEG, END and LEN." (re-search-forward diff-context-mid-hunk-header-re nil t))))) (when (and ;; Don't try to fixup changes in the hunk header. - (> (car diff-unhandled-changes) start) + (>= (car diff-unhandled-changes) start) ;; Don't try to fixup changes in the mid-hunk header either. (or (not mid) (< (cdr diff-unhandled-changes) (match-beginning 0)) -- 2.11.4.GIT