* lisp/simple.el <Keypad support>: Remove key bindings duplicated with bindings.el.

Fixes: debbugs:14397

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89293a8a03d0f28608a129636db6ceb61f655da8..f2bb5297dbbb819f7d19f634b05cc961d99eb3d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,11 @@
        (python-pdbtrack-set-tracked-buffer): Fix logic for remote
        files.  Thanks to Russell Sim. (Bug#15378)
 
+2013-12-13  Juri Linkov  <juri@jurta.org>
+
+       * simple.el <Keypad support>: Remove key bindings duplicated
+       with bindings.el.  (Bug#14397)
+
 2013-12-13  Juri Linkov  <juri@jurta.org>
 
        * comint.el (comint-mode-map): Replace `delete-char' with

diff --git a/lisp/bindings.el b/lisp/bindings.el
index c159f44eecd1c03cf0f3af711921b2318ea2e6c6..4fa7c6daf820ad3214974411b721643a5a688508 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1069,7 +1069,7 @@ if `inhibit-field-text-motion' is non-nil."
              (kp-enter enter) (kp-decimal ?.)
              (kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4)
              (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
-             (kp-add +) (kp-subtract -) (kp-multiply *) (kp-divide /))))
+             (kp-add ?+) (kp-subtract ?-) (kp-multiply ?*) (kp-divide ?/))))
   (dolist (pair keys)
     (dolist (mod modifiers)
       (define-key function-key-map

diff --git a/lisp/simple.el b/lisp/simple.el
index af1139bb942f8307ae485fc63d79150821c2ecd2..4c6c836b70062007a680c1feb18f78ba304622c0 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7128,17 +7128,11 @@ PREFIX is the string that represents this modifier in an event type symbol."
         (normal (nth 1 keypad-normal)))
      (put keypad 'ascii-character normal)
      (define-key function-key-map (vector keypad) (vector normal))))
- '((kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4)
-   (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
-   (kp-space ?\s)
+ ;; See also kp-keys bound in bindings.el.
+ '((kp-space ?\s)
    (kp-tab ?\t)
    (kp-enter ?\r)
-   (kp-multiply ?*)
-   (kp-add ?+)
    (kp-separator ?,)
-   (kp-subtract ?-)
-   (kp-decimal ?.)
-   (kp-divide ?/)
    (kp-equal ?=)
    ;; Do the same for various keys that are represented as symbols under
    ;; GUIs but naturally correspond to characters.