changeset 69499:caf8f09897bc

* font-lock.el (font-lock-lines-before): Delete variable, subsumed by the new extend-region feature. (font-lock-after-change-function): Update correspondingly. * jit-lock.el (jit-lock-after-change): Update correspondingly. * progmodes/grep.el (font-lock-lines-before): Don't disable. * modes.texi (Region to Fontify): Remove font-lock-lines-before.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 15 Mar 2006 22:26:09 +0000
parents b17150b61168
children 9310e7b7380e
files etc/NEWS lisp/ChangeLog lisp/font-lock.el lisp/jit-lock.el lisp/progmodes/grep.el lispref/ChangeLog lispref/modes.texi
diffstat 7 files changed, 22 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS	Wed Mar 15 19:41:35 2006 +0000
+++ b/etc/NEWS	Wed Mar 15 22:26:09 2006 +0000
@@ -873,11 +873,6 @@
 `Info-mode-hook'.
 
 +++
-*** font-lock-lines-before specifies a number of lines before the
-current line that should be refontified when you change the buffer.
-The default value is 1.
-
-+++
 *** font-lock: in modes like C and Lisp where the fontification assumes that
 an open-paren in column 0 is always outside of any string or comment,
 font-lock now highlights any such open-paren-in-column-zero in bold-red
--- a/lisp/ChangeLog	Wed Mar 15 19:41:35 2006 +0000
+++ b/lisp/ChangeLog	Wed Mar 15 22:26:09 2006 +0000
@@ -1,3 +1,11 @@
+2006-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* font-lock.el (font-lock-lines-before): Delete variable, subsumed by
+	the new extend-region feature.
+	(font-lock-after-change-function): Update correspondingly.
+	* jit-lock.el (jit-lock-after-change): Update correspondingly.
+	* progmodes/grep.el (font-lock-lines-before): Don't disable.
+
 2006-03-15  Bill Wohler  <wohler@newt.com>
 
 	* image.el (image-load-path-for-library): Fix example by not
--- a/lisp/font-lock.el	Wed Mar 15 19:41:35 2006 +0000
+++ b/lisp/font-lock.el	Wed Mar 15 22:26:09 2006 +0000
@@ -281,12 +281,6 @@
 		 (other :tag "always" t)
 		 (integer :tag "size"))
   :group 'font-lock)
-
-(defcustom font-lock-lines-before 0
-  "*Number of lines before the changed text to include in refontification."
-  :type 'integer
-  :group 'font-lock
-  :version "22.1")
 
 
 ;; Originally these variable values were face names such as `bold' etc.
@@ -1098,9 +1092,8 @@
 	    ;; Fontify the region the major mode has specified.
 	    (setq beg (car region) end (cdr region))
 	  ;; Fontify the whole lines which enclose the region.
-	  (setq beg (progn (goto-char beg)
-			   (forward-line (- font-lock-lines-before)))
-		end (progn (goto-char end) (forward-line 1) (point))))
+	  (setq beg (progn (goto-char beg) (line-beginning-position))
+		end (progn (goto-char end) (line-beginning-position 2))))
 	(font-lock-fontify-region beg end)))))
 
 (defun font-lock-fontify-block (&optional arg)
--- a/lisp/jit-lock.el	Wed Mar 15 19:41:35 2006 +0000
+++ b/lisp/jit-lock.el	Wed Mar 15 22:26:09 2006 +0000
@@ -571,7 +571,7 @@
 	 (setq start (if region
 			 (car region)
 		       (goto-char start)
-		       (line-beginning-position (- 1 font-lock-lines-before))))
+		       (line-beginning-position)))
 
 	 ;; If we're in text that matches a multi-line font-lock pattern,
 	 ;; make sure the whole text will be redisplayed.
--- a/lisp/progmodes/grep.el	Wed Mar 15 19:41:35 2006 +0000
+++ b/lisp/progmodes/grep.el	Wed Mar 15 22:26:09 2006 +0000
@@ -33,8 +33,6 @@
 
 (require 'compile)
 
-(defvar font-lock-lines-before)
-
 
 (defgroup grep nil
   "Run compiler as inferior of Emacs, parse error messages."
@@ -536,10 +534,7 @@
        grep-regexp-alist)
   (set (make-local-variable 'compilation-process-setup-function)
        'grep-process-setup)
-  (set (make-local-variable 'compilation-disable-input) t)
-  ;; Set `font-lock-lines-before' to 0 to not refontify the previous
-  ;; line where grep markers may be already removed.
-  (set (make-local-variable 'font-lock-lines-before) 0))
+  (set (make-local-variable 'compilation-disable-input) t))
 
 ;;;###autoload
 (defun grep-find (command-args)
--- a/lispref/ChangeLog	Wed Mar 15 19:41:35 2006 +0000
+++ b/lispref/ChangeLog	Wed Mar 15 22:26:09 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* modes.texi (Region to Fontify): Remove font-lock-lines-before.
+
 2006-03-15  Bill Wohler  <wohler@newt.com>
 
 	* display.texi (Defining Images): Fix example in
@@ -14,7 +18,7 @@
 
 	* modes.texi: New node, "Region to Fontify" (for Font Lock).
 	This describes font-lock-extend-region-function.
-	("Other Font Lock Variables"): move "font-lock-lines-before" to
+	("Other Font Lock Variables"): Move "font-lock-lines-before" to
 	the new node "Region to Fontify".
 
 2006-03-13  Richard Stallman  <rms@gnu.org>
@@ -111,9 +115,9 @@
 
 2006-02-16  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
-	* display.texi (Other Display Specs, Image Descriptors): Revert
-	erroneous changes.  The previous description of image-descriptors
-	as `(image . PROPS)' was correct.
+	* display.texi (Other Display Specs, Image Descriptors):
+	Revert erroneous changes.  The previous description of
+	image-descriptors as `(image . PROPS)' was correct.
 
 2006-02-14  Richard M. Stallman  <rms@gnu.org>
 
@@ -164,8 +168,8 @@
 
 2006-01-29  Chong Yidong  <cyd@stupidchicken.com>
 
-	* display.texi (Other Display Specs, Image Descriptors): Image
-	description is a list, not a cons cell.
+	* display.texi (Other Display Specs, Image Descriptors):
+	Image description is a list, not a cons cell.
 
 2006-01-28  Luc Teirlinck  <teirllm@auburn.edu>
 
--- a/lispref/modes.texi	Wed Mar 15 19:41:35 2006 +0000
+++ b/lispref/modes.texi	Wed Mar 15 22:26:09 2006 +0000
@@ -2731,16 +2731,6 @@
 You can enlarge (or even reduce) the region to fontify by setting either
 of the following variables:
 
-@defvar font-lock-lines-before
-This variable specifies the number of extra lines to consider when
-refontifying the buffer after each text change.  Font lock begins
-refontifying from that number of lines before the changed region.  The
-default is 0, but using a larger value can be useful for coping with
-multi-line patterns.  This variable is ignored whenever
-@code{font-lock-extend-region-function} is set and returns a
-non-@code{nil} value.
-@end defvar
-
 @defvar font-lock-extend-region-function
 This buffer-local variable is either @code{nil} or is a function that
 determines the region to fontify, which Emacs then calls after each