Commit 4e9e1584 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to

highlight when one of them is empty.
parent 4490f875
2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
 
* 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.
......
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment