[Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el,v

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      07/11/16 23:46:01

Index: calc-aent.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-aent.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- calc-aent.el        14 Aug 2007 14:47:58 -0000      1.38
+++ calc-aent.el        16 Nov 2007 23:46:01 -0000      1.39
@@ -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