Mercurial > hg > xemacs-beta
changeset 3196:827b833cd3ce
[xemacs-hg @ 2006-01-08 20:00:41 by aidan]
Handle some GNU read-quoted-char integration difficulties.
| author | aidan |
|---|---|
| date | Sun, 08 Jan 2006 20:00:43 +0000 |
| parents | 44b3e4dda13e |
| children | de5dcf5c5967 |
| files | lisp/ChangeLog lisp/cmdloop.el |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 07 22:51:50 2006 +0000 +++ b/lisp/ChangeLog Sun Jan 08 20:00:43 2006 +0000 @@ -1,3 +1,9 @@ +2006-01-08 Aidan Kehoe <kehoea@parhasard.net> + + * cmdloop.el (read-quoted-char): + Eliminate some char/event confusion introduced by a GNU Emacs + sync. + 2006-01-06 Adrian Aichner <adrian@xemacs.org> * package-get.el (package-get-download-sites): Add pt.xemacs.org,
--- a/lisp/cmdloop.el Sat Jan 07 22:51:50 2006 +0000 +++ b/lisp/cmdloop.el Sun Jan 08 20:00:43 2006 +0000 @@ -579,7 +579,8 @@ (setq char (aref translated 0))))) (cond ((null char)) ((not (characterp char)) - (setq unread-command-events (list char) + ;; XEmacs change; event instead of char. + (setq unread-command-events (list event) done t)) ; ((/= (logand char ?\M-\^@) 0) ; ;; Turn a meta-character into a character with the 0200 bit set. @@ -598,7 +599,8 @@ ((and (not first) (eq char ?\C-m)) (setq done t)) ((not first) - (setq unread-command-events (list char) + ;; XEmacs change; event instead of char. + (setq unread-command-events (list event) done t)) (t (setq code (char-to-int char) done t)))