Mercurial > emacs
changeset 72230:d254902ce935
(font-lock-extend-jit-lock-region-after-change): New fun.
(font-lock-turn-on-thing-lock): Use it.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 01 Aug 2006 18:58:18 +0000 |
| parents | 098473f0486c |
| children | 3ca9684795fe |
| files | lisp/ChangeLog lisp/font-lock.el |
| diffstat | 2 files changed, 37 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Aug 01 18:19:36 2006 +0000 +++ b/lisp/ChangeLog Tue Aug 01 18:58:18 2006 +0000 @@ -1,5 +1,8 @@ 2006-08-01 Stefan Monnier <monnier@iro.umontreal.ca> + * font-lock.el (font-lock-extend-jit-lock-region-after-change): New fun. + (font-lock-turn-on-thing-lock): Use it. + * longlines.el (longlines-show-region): Make it work on read-only buffers as well.
--- a/lisp/font-lock.el Tue Aug 01 18:19:36 2006 +0000 +++ b/lisp/font-lock.el Tue Aug 01 18:58:18 2006 +0000 @@ -893,7 +893,11 @@ (set (make-local-variable 'font-lock-fontified) t) ;; Use jit-lock. (jit-lock-register 'font-lock-fontify-region - (not font-lock-keywords-only)))))) + (not font-lock-keywords-only)) + ;; Tell jit-lock how we extend the region to refontify. + (add-hook 'jit-lock-after-change-extend-region-functions + 'font-lock-extend-jit-lock-region-after-change + nil t))))) (defun font-lock-turn-off-thing-lock () (cond ((and (boundp 'fast-lock-mode) fast-lock-mode) @@ -1096,6 +1100,35 @@ end (progn (goto-char end) (line-beginning-position 2)))) (font-lock-fontify-region beg end))))) +(defvar jit-lock-start) (defvar jit-lock-end) +(defun font-lock-extend-jit-lock-region-after-change (beg end old-len) + (let ((region (font-lock-extend-region beg end old-len))) + (if region + (setq jit-lock-start (min jit-lock-start (car region)) + jit-lock-end (max jit-lock-end (cdr region))) + (save-excursion + (goto-char beg) + (forward-line 0) + (setq jit-lock-start + (min jit-lock-start + (if (and (not (eobp)) + (get-text-property (point) 'font-lock-multiline)) + (or (previous-single-property-change + (point) 'font-lock-multiline) + (point-min)) + (point)))) + (goto-char end) + (forward-line 1) + (setq jit-lock-end + (max jit-lock-end + (if (and (not (bobp)) + (get-text-property (1- (point)) + 'font-lock-multiline)) + (or (next-single-property-change + (1- (point)) 'font-lock-multiline) + (point-max)) + (point)))))))) + (defun font-lock-fontify-block (&optional arg) "Fontify some lines the way `font-lock-fontify-buffer' would. The lines could be a function or paragraph, or a specified number of lines.