Merge from emacs--devo--0

[gnu-emacs] / lisp / subr.el

diff --git a/lisp/subr.el b/lisp/subr.el
index bce80963705f7bcbdb441f6fd6b73f296e4e4be1..89328826eefd57c510d81e52e33983026b5b1428 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -703,7 +703,7 @@ The normal global definition of the character C-x indirects to this keymap.")
           ;; Filter out integers too large to be events.
           ;; M is the biggest modifier.
           (zerop (logand obj (lognot (1- (lsh ?\M-\^@ 1)))))
-          (char-valid-p (event-basic-type obj)))
+          (characterp (event-basic-type obj)))
       (and (symbolp obj)
           (get obj 'event-symbol-elements))
       (and (consp obj)