From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Tue, 19 Oct 2004 14:22:47 +0000 (+0000)
Subject: (calc-do-alg-entry): Remove Emacs version check.  Use `copy-keymap' to
X-Git-Tag: ttn-vms-21-2-B4~4488
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1625eaa20d8b2d43bc7f0a439129eeab4d5948b;p=emacs.git

(calc-do-alg-entry): Remove Emacs version check.  Use `copy-keymap' to
copy `esc-map'.
---

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)