Re: [PATCH] pcomplete (mis)defines read-event

Hi, pcomplete.el and iso-acc.el can not be used together if loaded in that order. I sent this trivial patch in October, and since it hasn't been applied I was bitten by it again when installing the recent sumo. Both iso-acc.el and pcomplete.el use (fboundp 'read-event) to differentiate between GNU Emacs and XEmacs. When running in XEmacs pcomplete defines read-event, but not with the complete GNU Emacs read-event semantics. This patch changes it to define pcomplete-read-event instead. The upstream author, John Wiegley, agreed to apply the patch to the upstream version in GNU Emacs cvs, but has not yet done so as far as I can see, so it would be nice if someone could appy it to the XEmacs repository. -- René xemacs-packages/pcomplete/ChangeLog addition: 2004-10-08 René Kyllingstad <listmailxemacs(a)kyllingstad.com&gt; * pcomplete.el: define pcomplete-read-event instead of read-event, since it's not a complete read-event implementation XEmacs Packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/pcomplete/pcomplete.el Index: xemacs-packages/pcomplete/pcomplete.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pcomplete/pcomplete.el,v retrieving revision 1.1 diff -u -u -r1.1 pcomplete.el --- xemacs-packages/pcomplete/pcomplete.el 2001/01/10 02:50:44 1.1 +++ xemacs-packages/pcomplete/pcomplete.el 2004/10/08 10:52:12 ＠＠ -934,8 +934,10 ＠＠ (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) ＠＠ -957,7 +959,7 ＠＠ (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)