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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d000ba48a7c899dab51fcbb558b1b24cb033e099..b78aa00b92519c992b2f0feadbe8ef1744ad2c65 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-21  Ren\e,Ai\e(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 f4b796dd1a769c3d10b8ac6bc4d38cc770a8b2db..b01bef39664d7cbf502514bf58132d2085eb9431 100644 (file)
--- 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)