diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce08638a6be..67faa758ca3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-08-26 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * smerge-mode.el (smerge-refined-change): Add :group. | ||
| 4 | |||
| 1 | 2005-08-25 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2005-08-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * smerge-mode.el (smerge-remove-props): Make the args non-optional. | 7 | * smerge-mode.el (smerge-remove-props): Make the args non-optional. |
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 71fb650da7d..4b677edc36a 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el | |||
| @@ -131,7 +131,8 @@ Used in `smerge-diff-base-mine' and related functions." | |||
| 131 | 131 | ||
| 132 | (defface smerge-refined-change | 132 | (defface smerge-refined-change |
| 133 | '((t :background "yellow")) | 133 | '((t :background "yellow")) |
| 134 | "Face used for char-based changes shown by `smerge-refine'.") | 134 | "Face used for char-based changes shown by `smerge-refine'." |
| 135 | :group 'smerge) | ||
| 135 | 136 | ||
| 136 | (easy-mmode-defmap smerge-basic-map | 137 | (easy-mmode-defmap smerge-basic-map |
| 137 | `(("n" . smerge-next) | 138 | `(("n" . smerge-next) |