diff options
| author | Stefan Monnier | 2005-08-25 20:13:38 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-08-25 20:13:38 +0000 |
| commit | 41796d0900f9fbcd4e1d6607746ecb1cb0e3a981 (patch) | |
| tree | f93c82155e1025c418834d54a7713d2d63204eac /lisp/ChangeLog | |
| parent | 537fd670e9d4ef0012ea3b8acad541cc9f409f42 (diff) | |
| download | emacs-41796d0900f9fbcd4e1d6607746ecb1cb0e3a981.tar.gz emacs-41796d0900f9fbcd4e1d6607746ecb1cb0e3a981.zip | |
(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.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 586500e7b30..ce08638a6be 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 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 |