[Emacs-diffs] /srv/bzr/emacs/trunk r102363: * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to

[Stefan Monnier]

------------------------------------------------------------
revno: 102363
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-11-12 08:35:36 -0500
message:
  * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to
  highlight when one of them is empty.
modified:
  lisp/ChangeLog
  lisp/vc/smerge-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-12 13:33:44 +0000
+++ b/lisp/ChangeLog    2010-11-12 13:35:36 +0000
@@ -1,5 +1,8 @@
 2010-11-12  Stefan Monnier  <address@hidden>
 
+       * vc/smerge-mode.el (smerge-refine): Choose better default part to
+       highlight when one of them is empty.
+
        * skeleton.el (skeleton-read): Don't use `newline' since it may strip
        trailing space.
        (skeleton-newline): New function.

=== modified file 'lisp/vc/smerge-mode.el'
--- a/lisp/vc/smerge-mode.el    2010-06-11 19:09:57 +0000
+++ b/lisp/vc/smerge-mode.el    2010-11-12 13:35:36 +0000
@@ -1009,6 +1009,10 @@
   (setq part (cond ((null (match-end 2)) 2)
                    ((eq (match-end 1) (match-end 3)) 1)
                    ((integerp part) part)
+                   ;; If one of the parts is empty, any refinement using
+                   ;; it will be trivial and uninteresting.
+                   ((eq (match-end 1) (match-beginning 1)) 1)
+                   ((eq (match-end 3) (match-beginning 3)) 3)
                    (t 2)))
   (let ((n1 (if (eq part 1) 2 1))
         (n2 (if (eq part 3) 2 3)))