X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Ffont-lock.el;h=b587a78105cc7dcc7643ae25a2139733bf3872d7;hp=91446fdb42c6023690d9a60c4849f050f6408c2e;hb=72a705551741d6f85a40eea486c222bac482d8dc;hpb=fb022c5b8ea6aca36b9661a6b2707afdd07e4c05

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 91446fd..b587a78 100644
--- 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
-      ;; 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