Mercurial > emacs
changeset 57589:e28f2c4ffed4
(calc-init-extensions): Define `calc-alg-map' and `calc-alg-esc-map'
for current Emacs.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Tue, 19 Oct 2004 14:21:31 +0000 |
| parents | 417fd5bc2bac |
| children | afc7ff1f1214 |
| files | lisp/calc/calc-ext.el |
| diffstat | 1 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc-ext.el Tue Oct 19 09:58:08 2004 +0000 +++ b/lisp/calc/calc-ext.el Tue Oct 19 14:21:31 2004 +0000 @@ -640,29 +640,27 @@ (define-key calc-mode-map (format "u%c" x) 'calc-quick-units))) "0123456789") - (or calc-emacs-type-19 (progn (let ((i ?A)) - (while (and (<= i ?z) (vectorp calc-mode-map)) - (if (eq (car-safe (aref calc-mode-map i)) 'keymap) - (aset calc-mode-map i - (cons 'keymap (cons (cons ?\e (aref calc-mode-map i)) - (cdr (aref calc-mode-map i)))))) + (while (<= i ?z) + (if (eq (car-safe (aref (nth 1 calc-mode-map) i)) 'keymap) + (aset (nth 1 calc-mode-map) i + (cons 'keymap (cons (cons ?\e (aref (nth 1 calc-mode-map) i)) + (cdr (aref (nth 1 calc-mode-map) i)))))) (setq i (1+ i)))) - - (setq calc-alg-map (copy-sequence calc-mode-map) - calc-alg-esc-map (copy-sequence esc-map)) + + (setq calc-alg-map (copy-keymap calc-mode-map) + calc-alg-esc-map (copy-keymap esc-map)) (let ((i 32)) (while (< i 127) (or (memq i '(?' ?` ?= ??)) - (aset calc-alg-map i 'calc-auto-algebraic-entry)) + (aset (nth 1 calc-alg-map) i 'calc-auto-algebraic-entry)) (or (memq i '(?# ?x ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)) - (aset calc-alg-esc-map i (aref calc-mode-map i))) + (aset (nth 1 calc-alg-esc-map) i (aref (nth 1 calc-mode-map) i))) (setq i (1+ i)))) (define-key calc-alg-map "\e" calc-alg-esc-map) (define-key calc-alg-map "\e\t" 'calc-roll-up) (define-key calc-alg-map "\e\C-m" 'calc-last-args-stub) (define-key calc-alg-map "\e\177" 'calc-pop-above) - )) ;; The following is a relic for backward compatability only. ;; The calc-define property list is now the recommended method.