Mercurial > emacs

changeset 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 3343be7361c1
children 819dadb3ec8d
files lisp/smerge-mode.el
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Thu May 10 16:21:37 2001 +0000
+++ b/lisp/smerge-mode.el	Thu May 10 20:23:20 2001 +0000
@@ -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 @@
 \\{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)