(with-temp-buffer): Assume kill-buffer can change current-buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50d418df4a21e097b2e40cb9d44dd993db082768..4e1ed6f6996a2c26569c1e13a4061b5903415a55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * subr.el (with-temp-buffer): Assume kill-buffer can change cur-buf.
+
        * textmodes/remember.el (remember-diary-convert-entry): Prefer boundp
        to with-no-warnings.
 

diff --git a/lisp/subr.el b/lisp/subr.el
index b23ca358060a43c9677b2d6d05671498fa71a6f1..b656d2ed203e05d7b55f96d24c21513a6ff43fda 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2557,11 +2557,12 @@ See also `with-temp-file' and `with-output-to-string'."
   (declare (indent 0) (debug t))
   (let ((temp-buffer (make-symbol "temp-buffer")))
     `(let ((,temp-buffer (generate-new-buffer " *temp*")))
-       (unwind-protect
-          (with-current-buffer ,temp-buffer
-            ,@body)
-        (and (buffer-name ,temp-buffer)
-             (kill-buffer ,temp-buffer))))))
+       ;; FIXME: kill-buffer can change current-buffer in some odd cases.
+       (with-current-buffer ,temp-buffer
+         (unwind-protect
+            (progn ,@body)
+           (and (buffer-name ,temp-buffer)
+                (kill-buffer ,temp-buffer)))))))
 
 (defmacro with-output-to-string (&rest body)
   "Execute BODY, return the text it sent to `standard-output', as a string."