Fix previous change.

1 files changed, 12 insertions, 16 deletions

diff --git a/lisp/composite.el b/lisp/composite.el
index cbaeb182d5..18c1cc02ee 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -385,23 +385,19 @@ See also the command `toggle-auto-composition'.")
   ;; We use this to preserve or protect things when modifying text properties.
   (defmacro save-buffer-state (varlist &rest body)
     "Bind variables according to VARLIST and eval BODY restoring buffer state."
-    (let ((modified (make-symbol "modified")))
-      `(let* ,(append varlist
-		      `((,modified (buffer-modified-p))
-			(buffer-undo-list t)
-			(inhibit-read-only t)
-			(inhibit-point-motion-hooks t)
-			(inhibit-modification-hooks t)
-			deactivate-mark
-			buffer-file-name
-			buffer-file-truename))
-	 (progn
-	   ,@body)
-	 (unless ,modified
-	   (restore-buffer-modified-p nil)))))
+    `(let* ,(append varlist
+		    '((modified (buffer-modified-p)) (buffer-undo-list t)
+		      (inhibit-read-only t) (inhibit-point-motion-hooks t)
+		      (inhibit-modification-hooks t)
+		      deactivate-mark buffer-file-name buffer-file-truename))
+       ,@body
+       (unless modified
+	 (restore-buffer-modified-p nil))))
   (put 'save-buffer-state 'lisp-indent-function 1)
-  (def-edebug-spec save-buffer-state let))
-
+  ;; Fixme: This makes bootstrapping fails by this error.
+  ;;   Symbol's function definition is void: eval-defun
+  ;;(def-edebug-spec save-buffer-state let)
+  )
 
 (defvar auto-composition-chunk-size 500
   "*Automatic composition chunks of this many characters, or smaller.")