mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

* jit-lock.el (jit-lock--run-functions): Do the `or' where it can be nil.

Browse Source
This commit is contained in:
Stefan Monnier 2015-03-31 00:04:39 -04:00
parent bc9a6fcd29
commit 81b0eade25
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/jit-lock.el
View File

@ -362,8 +362,14 @@ is active."
(`(,this-beg . ,this-end)
(if (eq (car-safe res) 'jit-lock-bounds)
(cdr res) (cons beg end))))
(setq tight-beg (max tight-beg (or this-beg (point-min))))
(setq tight-end (max tight-end (or this-end (point-max))))
;; If all functions don't fontify the same region, we currently
;; just try to "still be correct". But we could go further and for
;; the chunks of text that was fontified by some functions but not
;; all, we could add text-properties indicating which functions were
;; already run to avoid running them redundantly when we get to
;; those chunks.
(setq tight-beg (max (or tight-beg (point-min)) this-beg))
(setq tight-end (max (or tight-end (point-max)) this-end))
(setq loose-beg (max loose-beg this-beg))
(setq loose-end (max loose-end this-end))
nil)))
@ -402,7 +408,7 @@ Defaults to the whole buffer. END can be out of bounds."
;; `tight' is the part we've fully refontified, and `loose'
;; is the part we've partly refontified (some of the
;; functions have refontified it but maybe not all).
((`(,tight-beg ,tight-end ,loose-beg ,loose-end)
((`(,tight-beg ,tight-end ,loose-beg ,_loose-end)
(condition-case err
(jit-lock--run-functions start next)
;; If the user quits (which shouldn't happen in normal