diff options
| author | Alan Mackenzie <acm@muc.de> | 2015-04-04 10:26:31 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2015-04-04 10:32:23 +0000 |
| commit | 4fabcbfbcd8447351ae59b01b329a0dabebea872 (patch) | |
| tree | fe825494bd6f5a9b1db57b864cd64d822784474f | |
| parent | 4de97eafb36a155e520c27e2dee7e068e52f099b (diff) | |
| download | emacs-4fabcbfbcd8447351ae59b01b329a0dabebea872.tar.gz | |
Fix debbugs#20240 part two (jit-lock error during `comment-dwim').
jit-lock.el (jit-lock-after-change): Widen the buffer before
putting 'fontified text properties.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/jit-lock.el | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5757317f5e2..cab6abac615 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-04-04 Alan Mackenzie <acm@muc.de> + + Fix debbugs#20240 part two (jit-lock error during `comment-dwim'). + + * jit-lock.el (jit-lock-after-change): Widen the buffer before + putting 'fontified text properties. + 2015-04-03 Michael Albinus <michael.albinus@gmx.de> * net/tramp-cache.el (tramp-flush-file-property) diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 0faabeb879a..d5651c62811 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -650,12 +650,14 @@ will take place when text is fontified stealthily." (let ((jit-lock-start start) (jit-lock-end end)) (with-buffer-prepared-for-jit-lock - (run-hook-with-args 'jit-lock-after-change-extend-region-functions - start end old-len) - ;; Make sure we change at least one char (in case of deletions). - (setq jit-lock-end (min (max jit-lock-end (1+ start)) (point-max))) - ;; Request refontification. - (put-text-property jit-lock-start jit-lock-end 'fontified nil)) + (save-restriction + (widen) + (run-hook-with-args 'jit-lock-after-change-extend-region-functions + start end old-len) + ;; Make sure we change at least one char (in case of deletions). + (setq jit-lock-end (min (max jit-lock-end (1+ start)) (point-max))) + ;; Request refontification. + (put-text-property jit-lock-start jit-lock-end 'fontified nil))) ;; Mark the change for deferred contextual refontification. (when jit-lock-context-unfontify-pos (setq jit-lock-context-unfontify-pos |