[Emacs-diffs] Changes to emacs/lisp/subr.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/29 22:50:14

Index: subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -b -r1.584 -r1.585
--- subr.el     25 Mar 2008 19:42:33 -0000      1.584
+++ subr.el     29 Mar 2008 22:50:10 -0000      1.585
@@ -2557,11 +2557,12 @@
   (declare (indent 0) (debug t))
   (let ((temp-buffer (make-symbol "temp-buffer")))
     `(let ((,temp-buffer (generate-new-buffer " *temp*")))
-       (unwind-protect
+       ;; FIXME: kill-buffer can change current-buffer in some odd cases.
           (with-current-buffer ,temp-buffer
-            ,@body)
+         (unwind-protect
+            (progn ,@body)
         (and (buffer-name ,temp-buffer)
-             (kill-buffer ,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."