1 |
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts |
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts |
2 |
|
|
3 |
;; Copyright (C) 1999, 2000, 01, 03, 2004 Free Software Foundation, Inc. |
;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. |
4 |
|
|
5 |
;; Author: Stefan Monnier <monnier@cs.yale.edu> |
;; Author: Stefan Monnier <monnier@cs.yale.edu> |
6 |
;; Keywords: revision-control merge diff3 cvs conflict |
;; Keywords: revision-control merge diff3 cvs conflict |
667 |
(define-minor-mode smerge-mode |
(define-minor-mode smerge-mode |
668 |
"Minor mode to simplify editing output from the diff3 program. |
"Minor mode to simplify editing output from the diff3 program. |
669 |
\\{smerge-mode-map}" |
\\{smerge-mode-map}" |
670 |
nil " SMerge" nil |
:group 'smerge :lighter " SMerge" |
671 |
(when (and (boundp 'font-lock-mode) font-lock-mode) |
(when (and (boundp 'font-lock-mode) font-lock-mode) |
672 |
(set (make-local-variable 'font-lock-multiline) t) |
(set (make-local-variable 'font-lock-multiline) t) |
673 |
(save-excursion |
(save-excursion |