In pp-display-expression select old selected window only if it is still live (Bug...

* emacs-lisp/pp.el (pp-display-expression): Select old selected
window only if it is still live (Bug#12034).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dbd7fb4bf196c48e9def634cb1335dd9fe1b20c..95f59c65fc78432b93ae5911ec84939e92daac5d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+       * emacs-lisp/pp.el (pp-display-expression): Select old selected
+       window only if it is still live (Bug#12034).
+
 2012-07-25  Martin Rudalics  <rudalics@gmx.at>
 
        * subr.el (redirect-frame-focus): Add advertised calling

diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 48e0d6d6a21c8276e5ad3b2b9ad0605a9c76d1d9..30c16b51b9e9ad244c08a3b0ff6fc9bca39f8d98 100644 (file)
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -110,7 +110,8 @@ after OUT-BUFFER-NAME."
                         (progn
                           (select-window window)
                           (run-hooks 'temp-buffer-show-hook))
-                      (select-window old-selected)
+                      (when (window-live-p old-selected)
+                        (select-window old-selected))
                       (message "See buffer %s." out-buffer-name)))
                 (message "%s" (buffer-substring (point-min) (point)))
                 ))))))