emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111269: * lisp/vc/diff-mode.el (diff


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111269: * lisp/vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the
Date: Wed, 19 Dec 2012 14:41:43 -0500
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111269
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-12-19 14:41:43 -0500
message:
  * 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).
modified:
  lisp/ChangeLog
  lisp/vc/diff-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-19 13:01:16 +0000
+++ b/lisp/ChangeLog    2012-12-19 19:41:43 +0000
@@ -1,3 +1,8 @@
+2012-12-19  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2012-11-19 18:40:18 +0000
+++ b/lisp/vc/diff-mode.el      2012-12-19 19:41:43 +0000
@@ -1298,7 +1298,7 @@
                           (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))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]