Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/calculator.el (calculator-define-key): Undo last change

Browse source 
Make map argument mandatory instead (bug#22106).
(calculator-add-operators): Pass the argument that's not optional any more.
This commit is contained in:
Stefan Monnier 2015-12-07 09:09:13 -05:00
parent 8f725564b6
commit 6148555ee5
1 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lisp/calculator.el
View file

@ -379,6 +379,39 @@ Used for repeating operations in calculator-repR/L.")
;;;---------------------------------------------------------------------
;;; Key bindings
(defun calculator-define-key (key cmd map)
;; Arranges for unbound alphabetic keys to be used as their un/shifted
;; versions if those are bound (mimics the usual Emacs global bindings).
;; FIXME: We should adjust Emacs's native "fallback to unshifted binding"
;; such that it can also be used here, rather than having to use a hack like
;; this one.
(let* ((key (if (stringp key) (kbd key) key))
(omap (keymap-parent map)))
(define-key map key cmd)
;; "other" map, used for case-flipped bindings
(unless omap
(setq omap (make-sparse-keymap))
(suppress-keymap omap t)
(set-keymap-parent map omap))
(let ((m omap))
;; Bind all case-flipped versions.
(dotimes (i (length key))
(let* ((c (aref key i))
(k (vector c))
(b (lookup-key m k))
(defkey (lambda (x)
(define-key m k x)
(when (and (characterp c)
(or (<= ?A c ?Z) (<= ?a c ?z)))
(define-key m (vector (logxor 32 c)) x)))))
(cond ((= i (1- (length key)))
;; Prefer longer sequences.
(unless (keymapp b) (funcall defkey cmd)))
((keymapp b) (setq m b))
(t (let ((sub (make-sparse-keymap)))
(funcall defkey sub)
(setq m sub)))))))))
(defvar calculator-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map t)
@ -562,38 +595,6 @@ Used for repeating operations in calculator-repR/L.")
map)
"The calculator key map.")
(defun calculator-define-key (key cmd &optional map)
;; Arranges for unbound alphabetic keys to be used as their un/shifted
;; versions if those are bound (mimics the usual Emacs global
;; bindings).
(let* ((key (if (stringp key) (kbd key) key))
(map (or map calculator-mode-map))
(omap (keymap-parent map)))
(define-key map key cmd)
;; "other" map, used for case-flipped bindings
(unless omap
(setq omap (make-sparse-keymap))
(suppress-keymap omap t)
(set-keymap-parent map omap))
(let ((m omap))
;; Bind all case-flipped versions.
(dotimes (i (length key))
(let* ((c (aref key i))
(k (vector c))
(b (lookup-key m k))
(defkey (lambda (x)
(define-key m k x)
(when (and (characterp c)
(or (<= ?A c ?Z) (<= ?a c ?z)))
(define-key m (vector (logxor 32 c)) x)))))
(cond ((= i (1- (length key)))
;; Prefer longer sequences.
(unless (keymapp b) (funcall defkey cmd)))
((keymapp b) (setq m b))
(t (let ((sub (make-sparse-keymap)))
(funcall defkey sub)
(setq m sub)))))))))
;;;---------------------------------------------------------------------
;;; Startup and mode stuff
@ -801,7 +802,7 @@ Adds MORE-OPS to `calculator-operator', called initially to handle
(let ((added-ops nil))
(dolist (op more-ops)
(unless (eq (car op) 'nobind)
(calculator-define-key (car op) 'calculator-op))
(calculator-define-key (car op) 'calculator-op calculator-mode-map))
(push (if (eq (car op) 'nobind) (cdr op) op)
added-ops))
;; added-ops come first, but in correct order