aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-12-13 03:03:04 +0200
committerJuri Linkov2013-12-13 03:03:04 +0200
commit4a9c6865cba04b0bfb4518659f6c21224ff6fb3e (patch)
tree9dc646cf587acd64ebdd43c00b4917fe5b184f11
parentce030451728326b438faae611f6d6e95ac8b82de (diff)
downloademacs-4a9c6865cba04b0bfb4518659f6c21224ff6fb3e.tar.gz
emacs-4a9c6865cba04b0bfb4518659f6c21224ff6fb3e.zip
* lisp/simple.el <Keypad support>: Remove key bindings duplicated with bindings.el.
Fixes: debbugs:14397
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bindings.el2
-rw-r--r--lisp/simple.el10
3 files changed, 8 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89293a8a03d..f2bb5297dbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,11 @@
7 7
82013-12-13 Juri Linkov <juri@jurta.org> 82013-12-13 Juri Linkov <juri@jurta.org>
9 9
10 * simple.el <Keypad support>: Remove key bindings duplicated
11 with bindings.el. (Bug#14397)
12
132013-12-13 Juri Linkov <juri@jurta.org>
14
10 * comint.el (comint-mode-map): Replace `delete-char' with 15 * comint.el (comint-mode-map): Replace `delete-char' with
11 `delete-forward-char'. (Bug#16109) 16 `delete-forward-char'. (Bug#16109)
12 17
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c159f44eecd..4fa7c6daf82 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1069,7 +1069,7 @@ if `inhibit-field-text-motion' is non-nil."
1069 (kp-enter enter) (kp-decimal ?.) 1069 (kp-enter enter) (kp-decimal ?.)
1070 (kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4) 1070 (kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4)
1071 (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9) 1071 (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
1072 (kp-add +) (kp-subtract -) (kp-multiply *) (kp-divide /)))) 1072 (kp-add ?+) (kp-subtract ?-) (kp-multiply ?*) (kp-divide ?/))))
1073 (dolist (pair keys) 1073 (dolist (pair keys)
1074 (dolist (mod modifiers) 1074 (dolist (mod modifiers)
1075 (define-key function-key-map 1075 (define-key function-key-map
diff --git a/lisp/simple.el b/lisp/simple.el
index af1139bb942..4c6c836b700 100644
--- 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."
7128 (normal (nth 1 keypad-normal))) 7128 (normal (nth 1 keypad-normal)))
7129 (put keypad 'ascii-character normal) 7129 (put keypad 'ascii-character normal)
7130 (define-key function-key-map (vector keypad) (vector normal)))) 7130 (define-key function-key-map (vector keypad) (vector normal))))
7131 '((kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4) 7131 ;; See also kp-keys bound in bindings.el.
7132 (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9) 7132 '((kp-space ?\s)
7133 (kp-space ?\s)
7134 (kp-tab ?\t) 7133 (kp-tab ?\t)
7135 (kp-enter ?\r) 7134 (kp-enter ?\r)
7136 (kp-multiply ?*)
7137 (kp-add ?+)
7138 (kp-separator ?,) 7135 (kp-separator ?,)
7139 (kp-subtract ?-)
7140 (kp-decimal ?.)
7141 (kp-divide ?/)
7142 (kp-equal ?=) 7136 (kp-equal ?=)
7143 ;; Do the same for various keys that are represented as symbols under 7137 ;; Do the same for various keys that are represented as symbols under
7144 ;; GUIs but naturally correspond to characters. 7138 ;; GUIs but naturally correspond to characters.