In with-temp-buffer-window don't evaluate BODY within with-current-buffer (Bug#16816).

* window.el (with-temp-buffer-window): Don't evaluate BODY within
with-current-buffer (Bug#16816).

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51c52be172f..73b27f22ae6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,9 @@
         (adjust-window-trailing-edge): Call window--resizable with
         correct TRAIL argument.
 
+        (with-temp-buffer-window): Don't evaluate BODY within
+        with-current-buffer (Bug#16816).
+
 2014-02-21  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-check-cached-permissions):
diff --git a/lisp/window.el b/lisp/window.el
index 357d49d02a2..72b3138fd73 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -189,8 +189,8 @@ argument replaces this)."
     `(let* ((,buffer (temp-buffer-window-setup ,buffer-or-name))
             (standard-output ,buffer)
             ,window ,value)
+       (setq ,value (progn ,@body))
        (with-current-buffer ,buffer
-         (setq ,value (progn ,@body))
          (setq ,window (temp-buffer-window-show ,buffer ,action)))
 
        (if (functionp ,quit-function)