[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

[Lute Kamstra]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.32 emacs/lisp/smerge-mode.el:1.33
*** emacs/lisp/smerge-mode.el:1.32      Fri Apr 30 21:10:05 2004
--- emacs/lisp/smerge-mode.el   Mon Apr  4 09:09:01 2005
***************
*** 1,6 ****
  ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
  
! ;; Copyright (C) 1999, 2000, 01, 03, 2004  Free Software Foundation, Inc.
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: revision-control merge diff3 cvs conflict
--- 1,6 ----
  ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
  
! ;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, 
Inc.
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: revision-control merge diff3 cvs conflict
***************
*** 667,673 ****
  (define-minor-mode smerge-mode
    "Minor mode to simplify editing output from the diff3 program.
  \\{smerge-mode-map}"
!   nil " SMerge" nil
    (when (and (boundp 'font-lock-mode) font-lock-mode)
      (set (make-local-variable 'font-lock-multiline) t)
      (save-excursion
--- 667,673 ----
  (define-minor-mode smerge-mode
    "Minor mode to simplify editing output from the diff3 program.
  \\{smerge-mode-map}"
!   :group 'smerge :lighter " SMerge"
    (when (and (boundp 'font-lock-mode) font-lock-mode)
      (set (make-local-variable 'font-lock-multiline) t)
      (save-excursion