From: Stefan Monnier Date: Thu, 10 May 2001 20:23:48 +0000 (+0000) Subject: (smerge-mode): Force font-lock-multiline to t. X-Git-Tag: emacs-pretest-21.0.104~546 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f49941f67e42e323bf1915652df9746537b9c79;p=emacs.git (smerge-mode): Force font-lock-multiline to t. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ace76ab1d36..d4814f9228c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2001-05-10 Stefan Monnier + + * smerge-mode.el (smerge-mode): Force font-lock-multiline to t. + 2001-05-10 Eli Zaretskii * mail/emacsbug.el (report-emacs-bug): Don't switch the buffer to @@ -6,13 +10,12 @@ 2001-05-10 Gerd Moellmann * net/browse-url.el (browse-url-filename-alist): Allow UNC file - names for MS-Windows and MS-DOS. From Dan Holmsand - . + names for MS-Windows and MS-DOS. From Dan Holmsand . 2001-05-09 John Wiegley - * eshell/esh-util.el (eshell-convert-numeric-arguments): Annotated - the documentation string to tell users about + * eshell/esh-util.el (eshell-convert-numeric-arguments): + Annotated the documentation string to tell users about `eshell-no-numeric-conversions'. * eshell/esh-cmd.el (eshell-lisp-command): Don't perform numeric @@ -30,7 +33,7 @@ eshell/which, eshell/addpath. 2001-05-09 John Wiegley - + * eshell/esh-arg.el (eshell-parse-argument-hook): If a number is encountered as an argument, don't convert it right away, but tag the first character of the string with the text properties @@ -52,14 +55,14 @@ (eshell-proc-initialize): Don't bind keys for `eshell-stop-process' or `eshell-continue-process'. - * eshell/em-unix.el (eshell-shuffle-files): Apply - `directory-file-name' before calling `file-name-directory'. + * eshell/em-unix.el (eshell-shuffle-files): + Apply `directory-file-name' before calling `file-name-directory'. * eshell/em-hist.el (eshell-add-to-history): Reference to `eshell-history-ring' needed to be `eshell-history-index'. - * calendar/timeclock.el (timeclock-find-discrep): Initialize - `elapsed' to 0. + * calendar/timeclock.el (timeclock-find-discrep): + Initialize `elapsed' to 0. (timeclock-find-discrep): Set `timeclock-last-event-workday' if it's still nil. 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 ;; 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)