diff options
| author | Jay Belanger | 2004-10-21 19:20:11 +0000 |
|---|---|---|
| committer | Jay Belanger | 2004-10-21 19:20:11 +0000 |
| commit | 1480882c5f3cbbe05f7abfeaa0bf68c62d105b3a (patch) | |
| tree | fc100b03cbbd3beb39297620a355789b6b4130d9 | |
| parent | 22101fbb14bb3873c753e40f2800db9d5bfd297f (diff) | |
| download | emacs-1480882c5f3cbbe05f7abfeaa0bf68c62d105b3a.tar.gz emacs-1480882c5f3cbbe05f7abfeaa0bf68c62d105b3a.zip | |
(calc-alg-ent-map, calc-alg-ent-esc-map): Declared these variables
with defvar.
(calc-do-alg-entry): Since `calc-alg-ent-map' is bound, only check to
see if it is non-nil.
| -rw-r--r-- | lisp/calc/calc-aent.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 37f6112f6aa..2db722ccb2d 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el | |||
| @@ -295,11 +295,17 @@ | |||
| 295 | calc-dollar-used 0))) | 295 | calc-dollar-used 0))) |
| 296 | (calc-handle-whys)))) | 296 | (calc-handle-whys)))) |
| 297 | 297 | ||
| 298 | (defvar calc-alg-ent-map nil | ||
| 299 | "The keymap used for algebraic entry.") | ||
| 300 | |||
| 301 | (defvar calc-alg-ent-esc-map nil | ||
| 302 | "The keymap used for escapes in algebraic entry.") | ||
| 303 | |||
| 298 | (defun calc-do-alg-entry (&optional initial prompt no-normalize) | 304 | (defun calc-do-alg-entry (&optional initial prompt no-normalize) |
| 299 | (let* ((calc-buffer (current-buffer)) | 305 | (let* ((calc-buffer (current-buffer)) |
| 300 | (blink-paren-function 'calcAlg-blink-matching-open) | 306 | (blink-paren-function 'calcAlg-blink-matching-open) |
| 301 | (alg-exp 'error)) | 307 | (alg-exp 'error)) |
| 302 | (unless (boundp 'calc-alg-ent-map) | 308 | (unless calc-alg-ent-map |
| 303 | (setq calc-alg-ent-map (copy-keymap minibuffer-local-map)) | 309 | (setq calc-alg-ent-map (copy-keymap minibuffer-local-map)) |
| 304 | (define-key calc-alg-ent-map "'" 'calcAlg-previous) | 310 | (define-key calc-alg-ent-map "'" 'calcAlg-previous) |
| 305 | (define-key calc-alg-ent-map "`" 'calcAlg-edit) | 311 | (define-key calc-alg-ent-map "`" 'calcAlg-edit) |