[Emacs-diffs] /srv/bzr/emacs/trunk r108420: * lisp/simple.el (choose-completion): Use quit-window.

[Chong Yidong]

------------------------------------------------------------
revno: 108420
fixes bug: http://debbugs.gnu.org/11567
author: Martin Rudalics <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-29 20:21:45 +0800
message:
  * lisp/simple.el (choose-completion): Use quit-window.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-29 11:51:19 +0000
+++ b/lisp/ChangeLog    2012-05-29 12:21:45 +0000
@@ -1,3 +1,7 @@
+2012-05-29  Martin Rudalics  <address@hidden>
+
+       * simple.el (choose-completion): Use quit-window (Bug#11567).
+
 2012-05-29  Chong Yidong  <address@hidden>
 
        * whitespace.el (whitespace-cleanup): Fix usage of

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-05-29 09:09:38 +0000
+++ b/lisp/simple.el    2012-05-29 12:21:45 +0000
@@ -6203,16 +6203,7 @@
 
       (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