diff options
| author | Lute Kamstra | 2005-04-04 09:09:01 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-04-04 09:09:01 +0000 |
| commit | c06dbb8f150b59d0536f61bbcd2c242e5dfde2a0 (patch) | |
| tree | 13f26f4268c204656fc6eb09d522a9ca4807a13e | |
| parent | 9066a01ada33913251f374cf78c3e7db21c35813 (diff) | |
| download | emacs-c06dbb8f150b59d0536f61bbcd2c242e5dfde2a0.tar.gz emacs-c06dbb8f150b59d0536f61bbcd2c242e5dfde2a0.zip | |
(smerge-mode): Specify :group.
| -rw-r--r-- | lisp/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 1 | ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts | 1 | ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000, 01, 03, 2004 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: revision-control merge diff3 cvs conflict | 6 | ;; Keywords: revision-control merge diff3 cvs conflict |
| @@ -667,7 +667,7 @@ buffer names." | |||
| 667 | (define-minor-mode smerge-mode | 667 | (define-minor-mode smerge-mode |
| 668 | "Minor mode to simplify editing output from the diff3 program. | 668 | "Minor mode to simplify editing output from the diff3 program. |
| 669 | \\{smerge-mode-map}" | 669 | \\{smerge-mode-map}" |
| 670 | nil " SMerge" nil | 670 | :group 'smerge :lighter " SMerge" |
| 671 | (when (and (boundp 'font-lock-mode) font-lock-mode) | 671 | (when (and (boundp 'font-lock-mode) font-lock-mode) |
| 672 | (set (make-local-variable 'font-lock-multiline) t) | 672 | (set (make-local-variable 'font-lock-multiline) t) |
| 673 | (save-excursion | 673 | (save-excursion |