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

4 files changed, 12 insertions, 16 deletions

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)