(with-output-to-string): Make sure that the temporary buffer gets

killed.

1 files changed, 7 insertions, 6 deletions

diff --git a/lisp/subr.el b/lisp/subr.el
index 2aa802cd03e..2ce6b234e60 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2586,12 +2586,13 @@ See also `with-temp-file' and `with-output-to-string'."
   (declare (indent 0) (debug t))
   `(let ((standard-output
 	  (get-buffer-create (generate-new-buffer-name " *string-output*"))))
-     (let ((standard-output standard-output))
-       ,@body)
-     (with-current-buffer standard-output
-       (prog1
-	   (buffer-string)
-	 (kill-buffer nil)))))
+     (unwind-protect
+	 (progn
+	   (let ((standard-output standard-output))
+	     ,@body)
+	   (with-current-buffer standard-output
+	     (buffer-string)))
+       (kill-buffer standard-output))))
 
 (defmacro with-local-quit (&rest body)
   "Execute BODY, allowing quits to terminate BODY but not escape further.