From: Lute Kamstra <lute@gnu.org>
Date: Mon, 4 Apr 2005 09:09:01 +0000 (+0000)
Subject: (smerge-mode): Specify :group.
X-Git-Tag: ttn-vms-21-2-B4~1236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c06dbb8f150b59d0536f61bbcd2c242e5dfde2a0;p=emacs.git

(smerge-mode): Specify :group.
---

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 35903dcf749..d6a93a935d6 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -1,6 +1,6 @@
 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
 
-;; Copyright (C) 1999, 2000, 01, 03, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: revision-control merge diff3 cvs conflict
@@ -667,7 +667,7 @@ buffer names."
 (define-minor-mode smerge-mode
   "Minor mode to simplify editing output from the diff3 program.
 \\{smerge-mode-map}"
-  nil " SMerge" nil
+  :group 'smerge :lighter " SMerge"
   (when (and (boundp 'font-lock-mode) font-lock-mode)
     (set (make-local-variable 'font-lock-multiline) t)
     (save-excursion