diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-05-10 20:23:48 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-05-10 20:23:48 +0000 |
| commit | 0f49941f67e42e323bf1915652df9746537b9c79 (patch) | |
| tree | 51744b2d2f3fd9e56ff240b099fcc60ec1128e53 /lisp/smerge-mode.el | |
| parent | dd4e58c75c98241e0e4b1e14148d73c1ceee4a4e (diff) | |
| download | emacs-0f49941f67e42e323bf1915652df9746537b9c79.tar.gz emacs-0f49941f67e42e323bf1915652df9746537b9c79.tar.bz2 emacs-0f49941f67e42e323bf1915652df9746537b9c79.zip | |
(smerge-mode): Force font-lock-multiline to t.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 538ff11519a..5c8af81b492 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.11 2001/01/25 15:36:32 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.12 2001/03/07 00:16:29 monnier Exp $ ;; This file is part of GNU Emacs. @@ -466,6 +466,7 @@ The point is moved to the end of the conflict." \\{smerge-mode-map}" nil " SMerge" nil (when font-lock-mode + (set (make-local-variable 'font-lock-multiline) t) (save-excursion (if smerge-mode (font-lock-add-keywords nil smerge-font-lock-keywords 'append) |