Mercurial > emacs

changeset 61277:7fa982932904

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-mode): Specify :group.
author Lute Kamstra <lute@gnu.org>
date Mon, 04 Apr 2005 09:09:01 +0000
parents 31cb9b5b8d41
children 83d73d728418
files lisp/smerge-mode.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Mon Apr 04 09:07:45 2005 +0000
+++ b/lisp/smerge-mode.el	Mon Apr 04 09:09:01 2005 +0000
@@ -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 @@
 (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