Mercurial > emacs
comparison lisp/pcomplete.el @ 90787:91bf6e05918b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 662-669)
- Update from CVS
- Fix read-only prompt problem in isearch
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 207-208)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 18 Mar 2007 14:11:08 +0000 |
parents | 95d0cdf160ea df0cc74b8778 |
children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
90786:ca12f314faac | 90787:91bf6e05918b |
---|---|
972 (prog1 | 972 (prog1 |
973 (catch 'done | 973 (catch 'done |
974 (while (with-current-buffer (get-buffer "*Completions*") | 974 (while (with-current-buffer (get-buffer "*Completions*") |
975 (setq event (pcomplete-read-event))) | 975 (setq event (pcomplete-read-event))) |
976 (cond | 976 (cond |
977 ((event-matches-key-specifier-p event ? ) | 977 ((event-matches-key-specifier-p event ?\s) |
978 (set-window-configuration pcomplete-last-window-config) | 978 (set-window-configuration pcomplete-last-window-config) |
979 (setq pcomplete-last-window-config nil) | 979 (setq pcomplete-last-window-config nil) |
980 (throw 'done nil)) | 980 (throw 'done nil)) |
981 ((or (event-matches-key-specifier-p event 'tab) | 981 ((or (event-matches-key-specifier-p event 'tab) |
982 ;; Needed on a terminal | 982 ;; Needed on a terminal |
983 (event-matches-key-specifier-p event 9)) | 983 (event-matches-key-specifier-p event 9)) |
984 (save-selected-window | 984 (let ((win (or (get-buffer-window "*Completions*" 0) |
985 (select-window (get-buffer-window "*Completions*")) | 985 (display-buffer "*Completions*" |
986 (if (pos-visible-in-window-p (point-max)) | 986 'not-this-window)))) |
987 (goto-char (point-min)) | 987 (with-selected-window win |
988 (scroll-up))) | 988 (if (pos-visible-in-window-p (point-max)) |
989 (goto-char (point-min)) | |
990 (scroll-up)))) | |
989 (message "")) | 991 (message "")) |
990 (t | 992 (t |
991 (setq unread-command-events (list event)) | 993 (setq unread-command-events (list event)) |
992 (throw 'done nil))))) | 994 (throw 'done nil))))) |
993 (if (and pcomplete-last-window-config | 995 (if (and pcomplete-last-window-config |