[Emacs-diffs] trunk r115501: * lisp/simple.el <Keypad support>: Remove key bindings duplicated with bindings.el.

[Juri Linkov]

------------------------------------------------------------
revno: 115501
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14397
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-13 03:03:04 +0200
message:
  * lisp/simple.el <Keypad support>: Remove key bindings duplicated with 
bindings.el.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/bindings.el               
bindings.el-20091113204419-o5vbwnq5f7feedwu-1013
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-13 00:56:12 +0000
+++ b/lisp/ChangeLog    2013-12-13 01:03:04 +0000
@@ -7,6 +7,11 @@
 
 2013-12-13  Juri Linkov  <address@hidden>
 
+       * simple.el <Keypad support>: Remove key bindings duplicated
+       with bindings.el.  (Bug#14397)
+
+2013-12-13  Juri Linkov  <address@hidden>
+
        * comint.el (comint-mode-map): Replace `delete-char' with
        `delete-forward-char'.  (Bug#16109)
 

=== modified file 'lisp/bindings.el'
--- a/lisp/bindings.el  2013-12-11 00:45:10 +0000
+++ b/lisp/bindings.el  2013-12-13 01:03:04 +0000
@@ -1069,7 +1069,7 @@
              (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

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-12-11 14:22:26 +0000
+++ b/lisp/simple.el    2013-12-13 01:03:04 +0000
@@ -7128,17 +7128,11 @@
         (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.