*** lisp/simple.el	2012-05-04 23:16:47 +0000
--- lisp/simple.el	2012-05-28 17:54:25 +0000
***************
*** 6212,6227 ****
  
        (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))
  
        (with-current-buffer buffer
          (choose-completion-string
--- 6212,6218 ----
  
        (unless (buffer-live-p buffer)
          (error "Destination buffer is dead"))
!       (quit-window nil (posn-window (event-start event)))
  
        (with-current-buffer buffer
          (choose-completion-string