diff options
| author | Jay Belanger | 2004-10-19 14:22:47 +0000 |
|---|---|---|
| committer | Jay Belanger | 2004-10-19 14:22:47 +0000 |
| commit | f1625eaa20d8b2d43bc7f0a439129eeab4d5948b (patch) | |
| tree | 5c463f6f3d5f4d5750a1724d3377f22b75dcf581 | |
| parent | 4ebcaf0ef8d8501cb412ac4bab2c1ff4d689a5a3 (diff) | |
| download | emacs-f1625eaa20d8b2d43bc7f0a439129eeab4d5948b.tar.gz emacs-f1625eaa20d8b2d43bc7f0a439129eeab4d5948b.zip | |
(calc-do-alg-entry): Remove Emacs version check. Use `copy-keymap' to
copy `esc-map'.
| -rw-r--r-- | lisp/calc/calc-aent.el | 14 |
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 @@ | |||
| 305 | (define-key calc-alg-ent-map "`" 'calcAlg-edit) | 305 | (define-key calc-alg-ent-map "`" 'calcAlg-edit) |
| 306 | (define-key calc-alg-ent-map "\C-m" 'calcAlg-enter) | 306 | (define-key calc-alg-ent-map "\C-m" 'calcAlg-enter) |
| 307 | (define-key calc-alg-ent-map "\C-j" 'calcAlg-enter) | 307 | (define-key calc-alg-ent-map "\C-j" 'calcAlg-enter) |
| 308 | (or calc-emacs-type-19 | 308 | (let ((i 33)) |
| 309 | (let ((i 33)) | 309 | (setq calc-alg-ent-esc-map (copy-keymap esc-map)) |
| 310 | (setq calc-alg-ent-esc-map (copy-sequence esc-map)) | 310 | (while (< i 127) |
| 311 | (while (< i 127) | 311 | (aset (nth 1 calc-alg-ent-esc-map) i 'calcAlg-escape) |
| 312 | (aset calc-alg-ent-esc-map i 'calcAlg-escape) | 312 | (setq i (1+ i))))) |
| 313 | (setq i (1+ i)))))) | 313 | (define-key calc-alg-ent-map "\e" nil) |
| 314 | (unless calc-emacs-type-19 | ||
| 315 | (define-key calc-alg-ent-map "\e" nil)) | ||
| 316 | (if (eq calc-algebraic-mode 'total) | 314 | (if (eq calc-algebraic-mode 'total) |
| 317 | (define-key calc-alg-ent-map "\e" calc-alg-ent-esc-map) | 315 | (define-key calc-alg-ent-map "\e" calc-alg-ent-esc-map) |
| 318 | (define-key calc-alg-ent-map "\ep" 'calcAlg-plus-minus) | 316 | (define-key calc-alg-ent-map "\ep" 'calcAlg-plus-minus) |