aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-12-19 14:41:43 -0500
committerStefan Monnier2012-12-19 14:41:43 -0500
commitf4d79bd021831eb64e1bfc7f5c5b1ddb2138b37a (patch)
tree39877117ffe81015cab65eeed3728eef0a5fcb92
parenta2f07cd28277fbcef42541509e3710a9863cac3a (diff)
downloademacs-f4d79bd021831eb64e1bfc7f5c5b1ddb2138b37a.tar.gz
emacs-f4d79bd021831eb64e1bfc7f5c5b1ddb2138b37a.zip
* 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).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/diff-mode.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e16fe02d9c..3fd8b363546 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-12-19 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the
4 very beginning of a hunk (e.g. killing the first line).
5
12012-12-19 Michael Albinus <michael.albinus@gmx.de> 62012-12-19 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines 8 * 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."
1298 (re-search-forward diff-context-mid-hunk-header-re 1298 (re-search-forward diff-context-mid-hunk-header-re
1299 nil t))))) 1299 nil t)))))
1300 (when (and ;; Don't try to fixup changes in the hunk header. 1300 (when (and ;; Don't try to fixup changes in the hunk header.
1301 (> (car diff-unhandled-changes) start) 1301 (>= (car diff-unhandled-changes) start)
1302 ;; Don't try to fixup changes in the mid-hunk header either. 1302 ;; Don't try to fixup changes in the mid-hunk header either.
1303 (or (not mid) 1303 (or (not mid)
1304 (< (cdr diff-unhandled-changes) (match-beginning 0)) 1304 (< (cdr diff-unhandled-changes) (match-beginning 0))