Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
111515:dd011cba2fbf | 111516:80d61d4081a0 |
---|---|
1 2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca> | 1 2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca> |
2 | |
3 * vc/smerge-mode.el (smerge-refine): Choose better default part to | |
4 highlight when one of them is empty. | |
2 | 5 |
3 * skeleton.el (skeleton-read): Don't use `newline' since it may strip | 6 * skeleton.el (skeleton-read): Don't use `newline' since it may strip |
4 trailing space. | 7 trailing space. |
5 (skeleton-newline): New function. | 8 (skeleton-newline): New function. |
6 (skeleton-internal-1): Use it. | 9 (skeleton-internal-1): Use it. |