diff options
| author | John Wiegley <johnw@newartisans.com> | 2005-01-21 10:26:26 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2005-01-21 10:26:26 +0000 |
| commit | 2ff1dec97facba8512f1b731f8c91a5b833117a8 (patch) | |
| tree | 7d04058e5a28fe96c872425c163487543a484bbb /lisp | |
| parent | eee141ce6922778f818abd153b728c7b15832b5c (diff) | |
| download | emacs-2ff1dec97facba8512f1b731f8c91a5b833117a8.tar.gz | |
2005-01-21 Ren�yllingstad <listmailxemacs@kyllingstad.com>
* pcomplete.el: define pcomplete-read-event instead of read-event,
since it's not a complete read-event implementation
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pcomplete.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d000ba48a7c..b78aa00b925 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-21 Ren,Ai(B Kyllingstad <listmailxemacs@kyllingstad.com> + + * pcomplete.el: define pcomplete-read-event instead of read-event, + since it's not a complete read-event implementation + 2005-01-20 Jay Belanger <belanger@truman.edu> * calc/calc-ext.el (calc-fancy-prefix-other-key): Set prefix arg diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index f4b796dd1a7..b01bef39664 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -946,8 +946,10 @@ generate the completions list. This means that the hook (unless (fboundp 'event-matches-key-specifier-p) (defalias 'event-matches-key-specifier-p 'eq)) -(unless (fboundp 'read-event) - (defsubst read-event (&optional prompt) +(if (fboundp 'read-event) + (defsubst pcomplete-read-event (&optional prompt) + (read-event prompt)) + (defsubst pcomplete-read-event (&optional prompt) (aref (read-key-sequence prompt) 0))) (unless (fboundp 'event-basic-type) @@ -969,7 +971,7 @@ Typing SPC flushes the help buffer." (prog1 (catch 'done (while (with-current-buffer (get-buffer "*Completions*") - (setq event (read-event))) + (setq event (pcomplete-read-event))) (cond ((event-matches-key-specifier-p event ? ) (set-window-configuration pcomplete-last-window-config) |