From: Andreas Schwab <schwab@suse.de>
Date: Wed, 26 Dec 2007 19:05:28 +0000 (+0000)
Subject: (save-buffer-state): Make sure the state of the
X-Git-Tag: emacs-pretest-23.0.90~8823
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e97fd4fb02ca707a3eb0657d581862349e53067e;p=emacs.git

(save-buffer-state): Make sure the state of the
buffer is always restored.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 392eaa6d609..e6a14fcb813 100644
--- 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 dc350ce146b..76f3da98bec 100644
--- 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.