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

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      07/12/02 20:00:59

Index: calc-lang.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-lang.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- calc-lang.el        2 Dec 2007 03:45:14 -0000       1.32
+++ calc-lang.el        2 Dec 2007 20:00:58 -0000       1.33
@@ -35,7 +35,7 @@
 
 ;; Declare functions which are defined elsewhere.
 (declare-function math-compose-vector "calccomp" (a sep prec))
-(declare-function math-compose-var "calccomp" (a v))
+(declare-function math-compose-var "calccomp" (a))
 (declare-function math-tex-expr-is-flat "calccomp" (a))
 (declare-function math-read-factor "calc-aent" ())
 (declare-function math-read-expr-level "calc-aent" (exp-prec &optional 
exp-term))
@@ -685,7 +685,7 @@
         (math-compose-expr (nth 3 a) 0)
         (if (memq (nth 1 a) '(0 2)) ")" "]")))
 
-(defun math-compose-tex-var (a v prec)
+(defun math-compose-tex-var (a prec)
   (if (and calc-language-option
            (not (= calc-language-option 0))
            (string-match "\\`[a-zA-Z][a-zA-Z0-9]+\\'"
@@ -693,7 +693,7 @@
       (if (eq calc-language 'latex)
           (format "\\text{%s}" (symbol-name (nth 1 a)))
         (format "\\hbox{%s}" (symbol-name (nth 1 a))))
-    (math-compose-var a v)))
+    (math-compose-var a)))
 
 (defun math-compose-tex-func (func a)
   (let (left right)
@@ -986,7 +986,8 @@
 
 (put 'eqn 'math-var-formatter 
      (function
-      (lambda (a v prec)
+      (lambda (a prec)
+        (let (v)
         (if (and math-compose-hash-args
                  (let ((p calc-arg-values))
                    (setq v 1)
@@ -1005,7 +1006,7 @@
                       (intern (substring (symbol-name (nth 1 a)) 0 -1))
                       (intern (substring (symbol-name (nth 2 a)) 0 -1))))
                prec)
-            (symbol-name (nth 1 a)))))))
+              (symbol-name (nth 1 a))))))))
       
 (defconst math-eqn-special-funcs
   '( calcFunc-log