# HG changeset patch # User Jay Belanger # Date 1098195767 0 # Node ID afc7ff1f12142168328d5357863fa43273e7b86d # Parent e28f2c4ffed4eb1fddfbf0a379428e48e743b1cd (calc-do-alg-entry): Remove Emacs version check. Use `copy-keymap' to copy `esc-map'. diff -r e28f2c4ffed4 -r afc7ff1f1214 lisp/calc/calc-aent.el --- a/lisp/calc/calc-aent.el Tue Oct 19 14:21:31 2004 +0000 +++ b/lisp/calc/calc-aent.el Tue Oct 19 14:22:47 2004 +0000 @@ -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)