diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2007-11-16 23:48:26 +0000 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2007-11-16 23:48:26 +0000 |
| commit | b2e7f0f07fac4aa5d18b38cf73ff0e59198302f2 (patch) | |
| tree | 6ed52a16659c7beb1f5a88afc786372c95fc46f1 /lisp/calc/calc-aent.el | |
| parent | 66b04bd4408a9fae43acce906e54ebb53dfd48b2 (diff) | |
| download | emacs-b2e7f0f07fac4aa5d18b38cf73ff0e59198302f2.tar.gz emacs-b2e7f0f07fac4aa5d18b38cf73ff0e59198302f2.tar.bz2 emacs-b2e7f0f07fac4aa5d18b38cf73ff0e59198302f2.zip | |
(calc-last-user-lang-parse-table): New variable.
(math-build-parse-table): Get parse information from `math-parse-table'.
Diffstat (limited to 'lisp/calc/calc-aent.el')
| -rw-r--r-- | lisp/calc/calc-aent.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index ffd07bd8f2e..18b0e194777 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -603,6 +603,7 @@ in Calc algebraic input.") (defvar calc-user-parse-table nil) (defvar calc-last-main-parse-table nil) +(defvar calc-last-user-lang-parse-table nil) (defvar calc-last-lang-parse-table nil) (defvar calc-user-tokens nil) (defvar calc-user-token-chars nil) @@ -612,10 +613,12 @@ in Calc algebraic input.") (defun math-build-parse-table () (let ((mtab (cdr (assq nil calc-user-parse-tables))) - (ltab (cdr (assq calc-language calc-user-parse-tables)))) + (ltab (cdr (assq calc-language calc-user-parse-tables))) + (lltab (get calc-language 'math-parse-table))) (or (and (eq mtab calc-last-main-parse-table) - (eq ltab calc-last-lang-parse-table)) - (let ((p (append mtab ltab)) + (eq ltab calc-last-user-lang-parse-table) + (eq lltab calc-last-lang-parse-table)) + (let ((p (append mtab ltab lltab)) (math-toks nil)) (setq calc-user-parse-table p) (setq calc-user-token-chars nil) @@ -629,7 +632,8 @@ in Calc algebraic input.") (length y))))) "\\|") calc-last-main-parse-table mtab - calc-last-lang-parse-table ltab))))) + calc-last-user-lang-parse-table ltab + calc-last-lang-parse-table lltab))))) (defun math-find-user-tokens (p) (while p |