# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1218760244 0
# Node ID d50fcbf5354de2e403e2ef87e7d47a35922432fa
# Parent  26543fe3b72d2b3049fa2701472418138b4bdf6a
(choose-completion): Try reselecting completion-reference-buffer.

diff -r 26543fe3b72d -r d50fcbf5354d lisp/simple.el
--- a/lisp/simple.el	Fri Aug 15 00:30:21 2008 +0000
+++ b/lisp/simple.el	Fri Aug 15 00:30:44 2008 +0000
@@ -5612,12 +5612,15 @@
     (setq completion (buffer-substring-no-properties beg end))
     (let ((owindow (selected-window)))
       (if (and (one-window-p t 'selected-frame)
-	       (window-dedicated-p (selected-window)))
+	       (window-dedicated-p owindow))
 	  ;; This is a special buffer's frame
 	  (iconify-frame (selected-frame))
 	(or (window-dedicated-p (selected-window))
 	    (bury-buffer)))
-      (select-window owindow))
+      (select-window
+       (or (and (buffer-live-p buffer)
+		(get-buffer-window buffer))
+	   owindow)))
     (choose-completion-string completion buffer base-size)))
 
 ;; Delete the longest partial match for STRING