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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/03/05 19:57:10

Index: pcomplete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcomplete.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- pcomplete.el        5 Mar 2007 17:32:38 -0000       1.26
+++ pcomplete.el        5 Mar 2007 19:57:10 -0000       1.27
@@ -974,18 +974,20 @@
            (while (with-current-buffer (get-buffer "*Completions*")
                     (setq event (pcomplete-read-event)))
              (cond
-              ((event-matches-key-specifier-p event ? )
+              ((event-matches-key-specifier-p event ?\s)
                (set-window-configuration pcomplete-last-window-config)
                (setq pcomplete-last-window-config nil)
                (throw 'done nil))
               ((or (event-matches-key-specifier-p event 'tab)
                     ;; Needed on a terminal
                     (event-matches-key-specifier-p event 9))
-               (save-selected-window
-                 (select-window (get-buffer-window "*Completions*" t))
+                (let ((win (or (get-buffer-window "*Completions*" 0)
+                               (display-buffer "*Completions*"
+                                               'not-this-window))))
+                  (with-selected-window win
                  (if (pos-visible-in-window-p (point-max))
                      (goto-char (point-min))
-                   (scroll-up)))
+                      (scroll-up))))
                (message ""))
               (t
                (setq unread-command-events (list event))