Commit 1d6fc0df authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/subr.el (eventp): Presume that if it looks vaguely like an event,

it's an event.

Fixes: debbugs:10190
parent d17337e5
2012-07-19 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (eventp): Presume that if it looks vaguely like an event,
it's an event (bug#10190).
2012-07-19 Fabián Ezequiel Gallina <fgallina@cuca> 2012-07-19 Fabián Ezequiel Gallina <fgallina@cuca>
   
Enhancements to ppss related code (thanks Stefan). Enhancements to ppss related code (thanks Stefan).
...@@ -5,7 +10,7 @@ ...@@ -5,7 +10,7 @@
(python-indent-calculate-indentation, python-indent-dedent-line) (python-indent-calculate-indentation, python-indent-dedent-line)
(python-indent-electric-colon, python-nav-forward-block) (python-indent-electric-colon, python-nav-forward-block)
(python-mode-abbrev-table) (python-mode-abbrev-table)
(python-info-assignment-continuation-line-p): Simplified checks (python-info-assignment-continuation-line-p): Simplify checks
for ppss context. for ppss context.
(python-info-continuation-line-p): Cleanup. (python-info-continuation-line-p): Cleanup.
(python-info-ppss-context): Do not catch 'quote. (python-info-ppss-context): Do not catch 'quote.
......
...@@ -909,17 +909,9 @@ The normal global definition of the character C-x indirects to this keymap.") ...@@ -909,17 +909,9 @@ The normal global definition of the character C-x indirects to this keymap.")
(defsubst eventp (obj) (defsubst eventp (obj)
"True if the argument is an event object." "True if the argument is an event object."
(or (and (integerp obj) (or (integerp obj)
;; FIXME: Why bother? (and (symbolp obj) obj (not (keywordp obj)))
;; Filter out integers too large to be events. (and (consp obj) (symbolp (car obj)))))
;; M is the biggest modifier.
(zerop (logand obj (lognot (1- (lsh ?\M-\^@ 1)))))
(characterp (event-basic-type obj)))
(and (symbolp obj)
(get obj 'event-symbol-elements))
(and (consp obj)
(symbolp (car obj))
(get (car obj) 'event-symbol-elements))))
(defun event-modifiers (event) (defun event-modifiers (event)
"Return a list of symbols representing the modifier keys in event EVENT. "Return a list of symbols representing the modifier keys in event EVENT.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment