# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 989526200 0
# Node ID 11f935c0552127195c4a0f2d5eaa86d951be5375
# Parent  3343be7361c13287f7add6becf7f6bd555aafa7d
(smerge-mode): Force font-lock-multiline to t.

diff -r 3343be7361c1 -r 11f935c05521 lisp/smerge-mode.el
--- 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)