* lisp/simple.el (choose-completion): Use quit-window.

Fixes: debbugs:11567

2 files changed, 5 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e4155e6c0d..a98bdda3526 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-29  Martin Rudalics  <rudalics@gmx.at>
+
+        * simple.el (choose-completion): Use quit-window (Bug#11567).
+
 2012-05-29  Chong Yidong  <cyd@gnu.org>
 
         * whitespace.el (whitespace-cleanup): Fix usage of
diff --git a/lisp/simple.el b/lisp/simple.el
index 544cc9a740f..113bebc76ce 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6203,16 +6203,7 @@ With prefix argument N, move N items (negative N means move backward)."
 
       (unless (buffer-live-p buffer)
         (error "Destination buffer is dead"))
-      (select-window (posn-window (event-start event)))
-      (if (and (one-window-p t 'selected-frame)
-               (window-dedicated-p (selected-window)))
-          ;; This is a special buffer's frame
-          (iconify-frame (selected-frame))
-        (or (window-dedicated-p (selected-window))
-            (bury-buffer)))
-      (select-window
-       (or (get-buffer-window buffer 0)
-           owindow))
+      (quit-window nil (posn-window (event-start event)))
 
       (with-current-buffer buffer
         (choose-completion-string