emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] Changes to emacs/lisp/diff-mode.el,v [EMACS_22_BASE]


From: Stefan Monnier
Subject: [Emacs-diffs] Changes to emacs/lisp/diff-mode.el,v [EMACS_22_BASE]
Date: Fri, 29 Feb 2008 02:40:15 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        08/02/29 02:40:11

Index: diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.99.2.12
retrieving revision 1.99.2.13
diff -u -b -r1.99.2.12 -r1.99.2.13
--- diff-mode.el        19 Feb 2008 21:31:20 -0000      1.99.2.12
+++ diff-mode.el        29 Feb 2008 02:40:10 -0000      1.99.2.13
@@ -1251,7 +1251,8 @@
                    (cond
                     ((and diff-valid-unified-empty-line
                           ;; Not just (eolp) so we don't infloop at eob.
-                          (eq (char-after) ?\n))
+                          (eq (char-after) ?\n)
+                          (> before 0) (> after 0))
                      (decf before) (decf after) t)
                     ((and (zerop before) (zerop after)) nil)
                     ((or (< before 0) (< after 0))




reply via email to

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