Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(calc-last-user-lang-parse-table): New variable.

Browse source 
(math-build-parse-table): Get parse information from `math-parse-table'.
This commit is contained in:
Jay Belanger 2007-11-16 23:48:26 +00:00
parent 66b04bd440
commit b2e7f0f07f
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2007-11-16 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc-aent.el (calc-last-user-lang-parse-table): New variable.
(math-build-parse-table): Get parse information from
`math-parse-table'.
2007-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
* window.el (recenter-last-op): New var.

12
lisp/calc/calc-aent.el
View file

@ -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