diff options
| author | Juri Linkov <juri@jurta.org> | 2013-12-13 03:03:04 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2013-12-13 03:03:04 +0200 |
| commit | 4a9c6865cba04b0bfb4518659f6c21224ff6fb3e (patch) | |
| tree | 9dc646cf587acd64ebdd43c00b4917fe5b184f11 /lisp | |
| parent | ce030451728326b438faae611f6d6e95ac8b82de (diff) | |
| download | emacs-4a9c6865cba04b0bfb4518659f6c21224ff6fb3e.tar.gz | |
* lisp/simple.el <Keypad support>: Remove key bindings duplicated with bindings.el.
Fixes: debbugs:14397
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/bindings.el | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 10 |
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 @@ 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 `delete-forward-char'. (Bug#16109) 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." (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 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." (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. |