Mercurial > emacs
changeset 35419:e233da20040a
(font-lock-multiline): Default to nil.
(font-lock-default-fontify-region): If font-lock-multiline is
nil, don't check the property `font-lock-multiline'.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 19 Jan 2001 13:32:08 +0000 |
| parents | 9f3d22817e83 |
| children | 5a9310b13ff5 |
| files | lisp/font-lock.el |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/font-lock.el Fri Jan 19 13:30:01 2001 +0000 +++ b/lisp/font-lock.el Fri Jan 19 13:32:08 2001 +0000 @@ -1,6 +1,6 @@ ;;; font-lock.el --- Electric font lock mode -;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000 +;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001 ;; Free Software Foundation, Inc. ;; Author: jwz, then rms, then sm @@ -649,7 +649,7 @@ Currently, valid mode names are `fast-lock-mode', `jit-lock-mode' and `lazy-lock-mode'. This is normally set via `font-lock-defaults'.") -(defvar font-lock-multiline 'undecided +(defvar font-lock-multiline nil "Whether font-lock should cater to multiline keywords. If nil, don't try to handle multiline patterns. If t, always handle multiline patterns. @@ -1203,7 +1203,8 @@ (set-syntax-table font-lock-syntax-table)) ;; check to see if we should expand the beg/end area for ;; proper multiline matches - (when (and (> beg (point-min)) + (when (and font-lock-multiline + (> beg (point-min)) (get-text-property (1- beg) 'font-lock-multiline)) ;; We are just after or in a multiline match. (setq beg (or (previous-single-property-change @@ -1211,8 +1212,9 @@ (point-min))) (goto-char beg) (setq beg (line-beginning-position))) - (setq end (or (text-property-any end (point-max) - 'font-lock-multiline nil) + (setq end (or (and font-lock-multiline + (text-property-any end (point-max) + 'font-lock-multiline nil)) (point-max))) (goto-char end) (setq end (line-beginning-position 2))