=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-07-22 21:14:12 +0000
+++ lisp/ChangeLog	2012-07-23 12:49:21 +0000
@@ -1,3 +1,8 @@
+2012-07-23  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+	* emacs-lisp/pp.el (pp-display-expression): Select old selected
+	window only if it is still live (Bug#).
+
 2012-07-22  Vincent Belaïche  <vincentb1@users.sourceforge.net>
 
 	* ses.el (ses-cell-formula-aset): New macro.

=== modified file 'lisp/emacs-lisp/pp.el'
--- lisp/emacs-lisp/pp.el	2012-02-05 02:09:35 +0000
+++ lisp/emacs-lisp/pp.el	2012-07-23 12:44:07 +0000
@@ -110,7 +110,8 @@
 			 (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)))
 		 ))))))