Mercurial > emacs
diff lisp/ChangeLog @ 65129:8303172e4c68
(smerge-remove-props): Make the args non-optional.
(smerge-keep-n): Remove props.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-kill-current): Don't remove props anymore
now that it's done in smerge-keep-n.
(smerge-refined-change): New face.
(smerge-refine-chopup-region, smerge-refine-highlight-change)
(smerge-refine): New funs.
(smerge-basic-map): Bind smerge-refine.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 25 Aug 2005 20:13:38 +0000 |
| parents | 62d66d39f609 |
| children | 459cbb37cbe7 2d92f5c9d6ae |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Aug 25 19:11:00 2005 +0000 +++ b/lisp/ChangeLog Thu Aug 25 20:13:38 2005 +0000 @@ -1,3 +1,15 @@ +2005-08-25 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-remove-props): Make the args non-optional. + (smerge-keep-n): Remove props. + (smerge-keep-base, smerge-keep-other, smerge-keep-mine) + (smerge-keep-current, smerge-kill-current): Don't remove props anymore + now that it's done in smerge-keep-n. + (smerge-refined-change): New face. + (smerge-refine-chopup-region, smerge-refine-highlight-change) + (smerge-refine): New funs. + (smerge-basic-map): Bind smerge-refine. + 2005-08-25 Juri Linkov <juri@jurta.org> * progmodes/grep.el (grep, grep-mode): Make buffer-local variables