* 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.

7 files changed, 22 insertions, 37 deletions

diff --git a/etc/NEWS b/etc/NEWS
index b7d93fe51bb..d273654500c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -873,11 +873,6 @@ fontification in Info, remove `turn-on-font-lock' from
 `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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea75ff76f44..840fef7fb81 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index bae492509ec..d3017e3b3f3 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -281,12 +281,6 @@ If a number, only buffers greater than this size have fontification messages."
                  (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 @@ what properties to clear before refontifying a region.")
             ;; 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)
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index f82ead462f0..84e0dc0cab3 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -571,7 +571,7 @@ will take place when text is fontified stealthily."
          (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.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 0e151ce9be2..6afa3f29348 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -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 @@ temporarily highlight in visited source lines."
        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)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 70df1ae03f4..1ea4a73365c 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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>
 
diff --git a/lispref/modes.texi b/lispref/modes.texi
index e15392ac85a..fc1953d24d9 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -2731,16 +2731,6 @@ on an earlier line.
 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