From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 26 Aug 2005 09:37:57 +0000 (+0000)
Subject: (smerge-refined-change): Add :group.
X-Git-Tag: emacs-pretest-22.0.90~7444
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6022f153abae31d4e8e0568e56717676d7e560e;p=emacs.git

(smerge-refined-change): Add :group.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce08638a6be..67faa758ca3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-26  Juanma Barranquero  <lekktu@gmail.com>
+
+	* smerge-mode.el (smerge-refined-change): Add :group.
+
 2005-08-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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."
 
 (defface smerge-refined-change
   '((t :background "yellow"))
-  "Face used for char-based changes shown by `smerge-refine'.")
+  "Face used for char-based changes shown by `smerge-refine'."
+  :group 'smerge)
 
 (easy-mmode-defmap smerge-basic-map
   `(("n" . smerge-next)