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).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51c52be172ff8150047debbedc0dd11620766989..73b27f22ae6e11068c189bf2e38f107e7efbd1cc 100644 (file)
--- 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 357d49d02a2def4ea7b5b4d69c7b31b50cc2029c..72b3138fd73f7852db74b83b80af3485e9e31b04 100644 (file)
--- 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)