[Emacs-diffs] Changes to emacs/lisp/font-lock.el

[Stefan Monnier]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.271 emacs/lisp/font-lock.el:1.272
*** emacs/lisp/font-lock.el:1.271       Sat Aug  6 22:13:42 2005
--- emacs/lisp/font-lock.el     Thu Sep  1 14:04:03 2005
***************
*** 224,240 ****
  (defgroup font-lock-extra-types nil
    "Extra mode-specific type names for highlighting declarations."
    :group 'font-lock)
- 
- ;; Define support mode groups here to impose `font-lock' group order.
- (defgroup fast-lock nil
-   "Font Lock support mode to cache fontification."
-   :load 'fast-lock
-   :group 'font-lock)
- 
- (defgroup lazy-lock nil
-   "Font Lock support mode to fontify lazily."
-   :load 'lazy-lock
-   :group 'font-lock)
  
  ;; User variables.
  
--- 224,229 ----
***************
*** 293,299 ****
                 (integer :tag "size"))
    :group 'font-lock)
  
! (defcustom font-lock-lines-before 1
    "*Number of lines before the changed text to include in refontification."
    :type 'integer
    :group 'font-lock
--- 282,288 ----
                 (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
***************
*** 1049,1054 ****
--- 1038,1045 ----
          ;; Use the fontification syntax table, if any.
          (when font-lock-syntax-table
            (set-syntax-table font-lock-syntax-table))
+           (goto-char beg)
+           (setq beg (line-beginning-position (- 1 font-lock-lines-before)))
          ;; check to see if we should expand the beg/end area for
          ;; proper multiline matches
          (when (and font-lock-multiline
***************
*** 1105,1112 ****
        (save-match-data
        ;; Rescan between start of lines enclosing the region.
        (font-lock-fontify-region
!        (progn (goto-char beg)
!               (forward-line (- font-lock-lines-before)) (point))
         (progn (goto-char end) (forward-line 1) (point)))))))
  
  (defun font-lock-fontify-block (&optional arg)
--- 1096,1102 ----
        (save-match-data
        ;; Rescan between start of lines enclosing the region.
        (font-lock-fontify-region
!        (progn (goto-char beg) (forward-line 0) (point))
         (progn (goto-char end) (forward-line 1) (point)))))))
  
  (defun font-lock-fontify-block (&optional arg)