Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 65128:62d66d39f609 | 65129:8303172e4c68 |
|---|---|
| 1 2005-08-25 Stefan Monnier <monnier@iro.umontreal.ca> | |
| 2 | |
| 3 * smerge-mode.el (smerge-remove-props): Make the args non-optional. | |
| 4 (smerge-keep-n): Remove props. | |
| 5 (smerge-keep-base, smerge-keep-other, smerge-keep-mine) | |
| 6 (smerge-keep-current, smerge-kill-current): Don't remove props anymore | |
| 7 now that it's done in smerge-keep-n. | |
| 8 (smerge-refined-change): New face. | |
| 9 (smerge-refine-chopup-region, smerge-refine-highlight-change) | |
| 10 (smerge-refine): New funs. | |
| 11 (smerge-basic-map): Bind smerge-refine. | |
| 12 | |
| 1 2005-08-25 Juri Linkov <juri@jurta.org> | 13 2005-08-25 Juri Linkov <juri@jurta.org> |
| 2 | 14 |
| 3 * progmodes/grep.el (grep, grep-mode): Make buffer-local variables | 15 * progmodes/grep.el (grep, grep-mode): Make buffer-local variables |
| 4 compilation-process-setup-function and compilation-disable-input | 16 compilation-process-setup-function and compilation-disable-input |
| 5 in grep-mode instead of let-bindings in grep. | 17 in grep-mode instead of let-bindings in grep. |