(switch-to-completions): Look for *Completions* in other frames as well.

2 files changed, 6 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 845fdf11be2..ba788adc109 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * simple.el (switch-to-completions): Look for *Completions* in other
+        frames as well.
+
         * pcomplete.el: Allow the use of completion-tables.
         (pcomplete-std-complete): New command.
         (pcomplete-dirs-or-entries): Use a single call to pcomplete-entries.
diff --git a/lisp/simple.el b/lisp/simple.el
index 2a9b8508b2d..34107edf432 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6024,10 +6024,10 @@ select the completion near point.\n\n"))))))
 (defun switch-to-completions ()
   "Select the completion list window."
   (interactive)
+  (let ((window (or (get-buffer-window "*Completions*" 0)
   ;; Make sure we have a completions window.
-  (or (get-buffer-window "*Completions*")
-      (minibuffer-completion-help))
-  (let ((window (get-buffer-window "*Completions*")))
+                    (progn (minibuffer-completion-help)
+                           (get-buffer-window "*Completions*" 0)))))
     (when window
       (select-window window)
       (goto-char (point-min))