Merge from emacs--devo--0

[bpt/emacs.git] / lisp / subr.el

diff --git a/lisp/subr.el b/lisp/subr.el
index f890caf..ff43b9f 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -702,7 +702,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)
@@ -1219,8 +1219,7 @@ if it is empty or a duplicate."
 Execution is delayed if `delay-mode-hooks' is non-nil.
 If `delay-mode-hooks' is nil, run `after-change-major-mode-hook'
 after running the mode hooks.
-Major mode functions should use this instead of `run-hooks' when running their
-FOO-mode-hook."
+Major mode functions should use this."
   (if delay-mode-hooks
       ;; Delaying case.
       (dolist (hook hooks)