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

[Jay Belanger]

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

Index: calccomp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calccomp.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- calccomp.el 2 Dec 2007 03:14:55 -0000       1.22
+++ calccomp.el 2 Dec 2007 20:00:36 -0000       1.23
@@ -70,7 +70,8 @@
 (defvar math-comp-right-bracket)
 (defvar math-comp-comma)
 
-(defun math-compose-var (a v)
+(defun math-compose-var (a)
+  (let (v)
   (if (and math-compose-hash-args
            (let ((p calc-arg-values))
              (setq v 1)
@@ -83,7 +84,7 @@
         (format "#%d" v))
     (if (memq calc-language calc-lang-allow-underscores)
         (math-to-underscores (symbol-name (nth 1 a)))
-      (symbol-name (nth 1 a)))))
+        (symbol-name (nth 1 a))))))
 
 (defun math-compose-expr (a prec)
   (let ((math-compose-level (1+ math-compose-level))
@@ -332,8 +333,8 @@
        (if v
            (symbol-name (car v))
           (if (setq spfn (get calc-language 'math-var-formatter))
-              (funcall spfn a v prec)
-            (math-compose-var a v)))))
+              (funcall spfn a prec)
+            (math-compose-var a)))))
      ((eq (car a) 'intv)
       (list 'horiz
             (if (memq (nth 1 a) '(0 1)) "(" "[")