[Emacs-diffs] Changes to emacs/lisp/simple.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/15 00:30:46

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -b -r1.944 -r1.945
--- simple.el   14 Aug 2008 23:44:29 -0000      1.944
+++ simple.el   15 Aug 2008 00:30:44 -0000      1.945
@@ -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