diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-12 08:35:36 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-12 08:35:36 -0500 |
| commit | 4e9e1584fd08ee318589e70049dd22429fd7e9c3 (patch) | |
| tree | c05558bb08f19ee31b43fd8615f1aec79d6cd07a /lisp/vc/smerge-mode.el | |
| parent | 4490f87580a8f9ade324ea1d3a095dddca8ecf1d (diff) | |
| download | emacs-4e9e1584fd08ee318589e70049dd22429fd7e9c3.tar.gz | |
* lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to
highlight when one of them is empty.
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 6e72071b6a0..32f829f814e 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1009,6 +1009,10 @@ repeating the command will highlight other two parts." (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))) |