diff lisp/font-lock.el @ 373:6240c7796c7a r21-2b2

Import from CVS: tag r21-2b2
author cvs
date Mon, 13 Aug 2007 11:04:06 +0200
parents cc15677e0335
children 8626e4521993
line wrap: on
line diff
--- a/lisp/font-lock.el	Mon Aug 13 11:03:09 2007 +0200
+++ b/lisp/font-lock.el	Mon Aug 13 11:04:06 2007 +0200
@@ -1073,8 +1073,9 @@
   ;; 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