# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1182312735 0
# Node ID a90e4a0758e3206fc43443b43611442c6a833ce8
# Parent  e51a63a9559048461b356f1ead889317aedaa002
(calc-do-calc-eval): Let math-expr-opers equal the function
math-standard-ops rather than the variable math-standard-opers.
(calc-algebraic-entry): Let math-expr-opers equal math-standard-ops or
math-expr-ops, as appropriate.
(math-expr-read-level,math-read-factor): Let math-expr-opers equal
math-expr-ops.

diff -r e51a63a95590 -r a90e4a0758e3 lisp/calc/calc-aent.el
--- a/lisp/calc/calc-aent.el	Wed Jun 20 04:07:24 2007 +0000
+++ b/lisp/calc/calc-aent.el	Wed Jun 20 04:12:15 2007 +0000
@@ -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)