[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/06/20 04:12:15

Index: calc-aent.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-aent.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- calc-aent.el        23 Apr 2007 21:15:18 -0000      1.35
+++ calc-aent.el        20 Jun 2007 04:12:15 -0000      1.36
@@ -100,7 +100,7 @@
       (cond
        ((and (consp str) (not (symbolp (car str))))
        (let ((calc-language nil)
-             (math-expr-opers math-standard-opers)
+             (math-expr-opers (math-standard-ops))
              (calc-internal-prec 12)
              (calc-word-size 32)
              (calc-symbolic-mode nil)
@@ -254,7 +254,7 @@
   (interactive "P")
   (calc-wrapper
    (let ((calc-language (if prefix nil calc-language))
-        (math-expr-opers (if prefix math-standard-opers math-expr-opers)))
+        (math-expr-opers (if prefix (math-standard-ops) (math-expr-ops))))
      (calc-alg-entry (and auto (char-to-string last-command-char))))))
 
 (defvar calc-alg-entry-history nil
@@ -876,7 +876,10 @@
                calcFunc-eq calcFunc-neq))
 
 (defun math-read-expr-level (exp-prec &optional exp-term)
-  (let* ((x (math-read-factor)) (first t) op op2)
+  (let* ((math-expr-opers (math-expr-ops))
+         (x (math-read-factor)) 
+         (first t) 
+         op op2)
     (while (and (or (and calc-user-parse-table
                         (setq op (calc-check-user-syntax x exp-prec))
                         (setq x op
@@ -1121,7 +1124,8 @@
        (assoc math-expr-data '(("(") ("[") ("{"))))))
 
 (defun math-read-factor ()
-  (let (op)
+  (let ((math-expr-opers (math-expr-ops))
+        op)
     (cond ((eq math-exp-token 'number)
           (let ((num (math-read-number math-expr-data)))
             (if (not num)