[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el |
Date: |
Fri, 26 Aug 2005 05:37:04 -0400 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.42 emacs/lisp/smerge-mode.el:1.43
*** emacs/lisp/smerge-mode.el:1.42 Thu Aug 25 20:13:38 2005
--- emacs/lisp/smerge-mode.el Fri Aug 26 09:37:04 2005
***************
*** 131,137 ****
(defface smerge-refined-change
'((t :background "yellow"))
! "Face used for char-based changes shown by `smerge-refine'.")
(easy-mmode-defmap smerge-basic-map
`(("n" . smerge-next)
--- 131,138 ----
(defface smerge-refined-change
'((t :background "yellow"))
! "Face used for char-based changes shown by `smerge-refine'."
! :group 'smerge)
(easy-mmode-defmap smerge-basic-map
`(("n" . smerge-next)