Mercurial > emacs

comparison lisp/smerge-mode.el @ 37674:11f935c05521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-mode): Force font-lock-multiline to t.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 10 May 2001 20:23:20 +0000
parents c0360458748f
children 7f82c0bbe525
comparison
equal deleted inserted replaced
37673:3343be7361c1 37674:11f935c05521
2 2
3 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. 3 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
4 4
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> 5 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
6 ;; Keywords: merge diff3 cvs conflict 6 ;; Keywords: merge diff3 cvs conflict
7 ;; Revision: $Id: smerge-mode.el,v 1.11 2001/01/25 15:36:32 monnier Exp $ 7 ;; Revision: $Id: smerge-mode.el,v 1.12 2001/03/07 00:16:29 monnier Exp $
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.
10 10
11 ;; GNU Emacs is free software; you can redistribute it and/or modify 11 ;; GNU Emacs is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by 12 ;; it under the terms of the GNU General Public License as published by
464 (define-minor-mode smerge-mode 464 (define-minor-mode smerge-mode
465 "Minor mode to simplify editing output from the diff3 program. 465 "Minor mode to simplify editing output from the diff3 program.
466 \\{smerge-mode-map}" 466 \\{smerge-mode-map}"
467 nil " SMerge" nil 467 nil " SMerge" nil
468 (when font-lock-mode 468 (when font-lock-mode
469 (set (make-local-variable 'font-lock-multiline) t)
469 (save-excursion 470 (save-excursion
470 (if smerge-mode 471 (if smerge-mode
471 (font-lock-add-keywords nil smerge-font-lock-keywords 'append) 472 (font-lock-add-keywords nil smerge-font-lock-keywords 'append)
472 (font-lock-remove-keywords nil smerge-font-lock-keywords)) 473 (font-lock-remove-keywords nil smerge-font-lock-keywords))
473 (goto-char (point-min)) 474 (goto-char (point-min))