Mercurial > hg > xemacs-beta
comparison lisp/minibuf.el @ 5745:f9e4d44504a4
Document #'events-to-keys some more, use it less.
lisp/ChangeLog addition:
2013-07-10 Aidan Kehoe <kehoea@parhasard.net>
* minibuf.el (get-user-response):
* cmdloop.el (y-or-n-p-minibuf):
No need to call #'events-to-keys in these two functions,
#'lookup-key accepts events directly.
* keymap.el:
* keymap.el (events-to-keys):
Document this function some more.
Stop passing strings through unexamined, treat them as vectors of
characters.
Event keys are never integers, remove some code that only ran if
(integerp (event-key ce)).
Event keys are never numbers, don't check for that.
Don't create (menu-selection call-interactively function-name)
keystrokes for menu choices, #'character-to-event doesn't
understand that syntax, so nothing uses it.
Don't ever accept mouse events, #'character-to-event doesn't
accept our synthesising of them.
src/ChangeLog addition:
2013-07-10 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
* keymap.c (key_desc_list_to_event):
Drop the allow_menu_events argument.
Don't accept lists starting with Qmenu_selection as describing
keys, nothing generates them in a way this function
understands. The intention is reasonable but the implementation
was never documented and never finished.
* keymap.c (syms_of_keymap):
Drop Qmenu_selection.
* events.c (Fcharacter_to_event):
* keymap.h:
Drop the allow_menu_events argument to key_desc_list_to_event.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 10 Jul 2013 14:14:30 +0100 |
parents | daf5accfe973 |
children | bbe4146603db |
comparison
equal
deleted
inserted
replaced
5738:f6af091ac654 | 5745:f9e4d44504a4 |
---|---|
2266 (progn | 2266 (progn |
2267 (message "%s%s(%s) %s" pre question possible | 2267 (message "%s%s(%s) %s" pre question possible |
2268 (single-key-description event)) | 2268 (single-key-description event)) |
2269 (setq quit-flag nil) | 2269 (setq quit-flag nil) |
2270 (signal 'quit '()))) | 2270 (signal 'quit '()))) |
2271 (let* ((keys (events-to-keys (vector event))) | 2271 (let ((def (lookup-key query-replace-map (vector event)))) |
2272 (def (lookup-key query-replace-map keys))) | |
2273 (cond | 2272 (cond |
2274 ; ((eq def 'skip) | |
2275 ; (message "%s%sNo" question possible) | |
2276 ; (return nil)) | |
2277 ; ((eq def 'act) | |
2278 ; (message "%s%sYes" question possible) | |
2279 ; (return t)) | |
2280 ((eq def 'recenter) | 2273 ((eq def 'recenter) |
2281 (recenter)) | 2274 (recenter)) |
2282 ((or (eq def 'quit) (eq def 'exit-prefix)) | 2275 ((or (eq def 'quit) (eq def 'exit-prefix)) |
2283 (signal 'quit '())) | 2276 (signal 'quit '())) |
2284 ((button-release-event-p event) ; ignore them | 2277 ((button-release-event-p event) ; ignore them |