Mercurial > emacs
diff lisp/ChangeLog @ 111516:80d61d4081a0
* lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to
highlight when one of them is empty.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 12 Nov 2010 08:35:36 -0500 |
| parents | dd011cba2fbf |
| children | 275f265c56c5 |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 12 08:33:44 2010 -0500 +++ b/lisp/ChangeLog Fri Nov 12 08:35:36 2010 -0500 @@ -1,5 +1,8 @@ 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.