summaryrefslogtreecommitdiff
path: root/lisp/calc/calc-aent.el
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2004-10-19 14:22:47 +0000
committerJay Belanger <jay.p.belanger@gmail.com>2004-10-19 14:22:47 +0000
commitf1625eaa20d8b2d43bc7f0a439129eeab4d5948b (patch)
tree5c463f6f3d5f4d5750a1724d3377f22b75dcf581 /lisp/calc/calc-aent.el
parent4ebcaf0ef8d8501cb412ac4bab2c1ff4d689a5a3 (diff)
downloademacs-f1625eaa20d8b2d43bc7f0a439129eeab4d5948b.tar.gz
(calc-do-alg-entry): Remove Emacs version check. Use `copy-keymap' to
copy `esc-map'.
Diffstat (limited to 'lisp/calc/calc-aent.el')
-rw-r--r--lisp/calc/calc-aent.el14
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index bc2f8f3b15f..54d17579bce 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -305,14 +305,12 @@
(define-key calc-alg-ent-map "`" 'calcAlg-edit)
(define-key calc-alg-ent-map "\C-m" 'calcAlg-enter)
(define-key calc-alg-ent-map "\C-j" 'calcAlg-enter)
- (or calc-emacs-type-19
- (let ((i 33))
- (setq calc-alg-ent-esc-map (copy-sequence esc-map))
- (while (< i 127)
- (aset calc-alg-ent-esc-map i 'calcAlg-escape)
- (setq i (1+ i))))))
- (unless calc-emacs-type-19
- (define-key calc-alg-ent-map "\e" nil))
+ (let ((i 33))
+ (setq calc-alg-ent-esc-map (copy-keymap esc-map))
+ (while (< i 127)
+ (aset (nth 1 calc-alg-ent-esc-map) i 'calcAlg-escape)
+ (setq i (1+ i)))))
+ (define-key calc-alg-ent-map "\e" nil)
(if (eq calc-algebraic-mode 'total)
(define-key calc-alg-ent-map "\e" calc-alg-ent-esc-map)
(define-key calc-alg-ent-map "\ep" 'calcAlg-plus-minus)