projects / chise / xemacs-chise.git.1 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
XEmacs 21.2-b2
[chise/xemacs-chise.git.1] / lisp / font-lock.el
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 91446fd..b587a78 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1073,8 +1073,9 @@ This can take a while for large buffers."
   ;; region as fontified; otherwise, the same error might get signaled
   ;; after every command.
   (unwind-protect
   ;; region as fontified; otherwise, the same error might get signaled
   ;; after every command.
   (unwind-protect
-      ;; buffer may be deleted.
-      (if (buffer-live-p (extent-object font-lock-old-extent))
+      ;; buffer/extent may be deleted.
+      (if (and (extent-live-p font-lock-old-extent)
+              (buffer-live-p (extent-object font-lock-old-extent)))
          (save-excursion
            (set-buffer (extent-object font-lock-old-extent))
            (font-lock-after-change-function-1
          (save-excursion
            (set-buffer (extent-object font-lock-old-extent))
            (font-lock-after-change-function-1