(save-buffer-state): Make sure the state of the

buffer is always restored.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 392eaa6d609b6cb1a083fe4d7354f9569db77a2f..e6a14fcb8130f1b80c935f666d4e4ef0a329af64 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-26  Andreas Schwab  <schwab@suse.de>
+
+       * font-lock.el (save-buffer-state): Make sure the state of the
+       buffer is always restored.
+
 2007-12-26  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc.el (calc-lang-allow-percentsigns): New variable.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index dc350ce146bf73fcc817a072ac806891dc41afb2..76f3da98bec98edb2990702068ebfccc9db6a714 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -616,10 +616,11 @@ Major/minor modes can set this variable if they know which option applies.")
                        deactivate-mark
                        buffer-file-name
                        buffer-file-truename))
-        (progn
-          ,@body)
-        (unless ,modified
-          (restore-buffer-modified-p nil)))))
+        (unwind-protect
+            (progn
+              ,@body)
+          (unless ,modified
+            (restore-buffer-modified-p nil))))))
   ;;
   ;; Shut up the byte compiler.
   (defvar font-lock-face-attributes))  ; Obsolete but respected if set.