Merge from emacs--devo--0

[gnu-emacs] / lisp / emulation / keypad.el

diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 28054c2dcb3d70dccb676fdc3d8969d39105d0d1..d691cf5fdf74bb60699afe24c10c91b2ec0925c3 100644 (file)
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -234,7 +234,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'"
         (bind
          (cond
           ((or (eq setup 'numeric)
-               (char-valid-p setup))
+               (characterp setup))
            (if (eq decimal 'numeric)
                (setq decimal nil))
            (vector (or decimal ?.) ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))