# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1195256761 0
# Node ID 8d7e01d03e559c94df0f10a9611f72e2767e13b5
# Parent  e509314f0d597cdd33ceca538a5de05bc6c57492
(calc-last-user-lang-parse-table): New variable.
(math-build-parse-table): Get parse information from `math-parse-table'.

diff -r e509314f0d59 -r 8d7e01d03e55 lisp/calc/calc-aent.el
--- a/lisp/calc/calc-aent.el	Fri Nov 16 21:58:46 2007 +0000
+++ b/lisp/calc/calc-aent.el	Fri Nov 16 23:46:01 2007 +0000
@@ -603,6 +603,7 @@
 
 (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 @@
 
 (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 @@
 								 (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