diff options
| author | Jay Belanger | 2007-06-20 04:14:24 +0000 |
|---|---|---|
| committer | Jay Belanger | 2007-06-20 04:14:24 +0000 |
| commit | 1dccbfee1a509a36ae372648df060586b7ddd38f (patch) | |
| tree | c785b7595b1605d8934d5da124b6c8eb7278051c | |
| parent | 2a6f048c0f85a345a69e9f111a637770eaabb361 (diff) | |
| download | emacs-1dccbfee1a509a36ae372648df060586b7ddd38f.tar.gz emacs-1dccbfee1a509a36ae372648df060586b7ddd38f.zip | |
(math-read-plain-expr,math-format-flat-expr-fancy): Let
math-expr-opers equal the function math-standard-ops rather
than the variable math-standard-opers.
| -rw-r--r-- | lisp/calc/calc-ext.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index ca89928d46e..bd85bee7dc1 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el | |||
| @@ -2960,7 +2960,7 @@ calc-kill calc-kill-region calc-yank)))) | |||
| 2960 | 2960 | ||
| 2961 | (defun math-read-plain-expr (exp-str &optional error-check) | 2961 | (defun math-read-plain-expr (exp-str &optional error-check) |
| 2962 | (let* ((calc-language nil) | 2962 | (let* ((calc-language nil) |
| 2963 | (math-expr-opers math-standard-opers) | 2963 | (math-expr-opers (math-standard-ops)) |
| 2964 | (val (math-read-expr exp-str))) | 2964 | (val (math-read-expr exp-str))) |
| 2965 | (and error-check | 2965 | (and error-check |
| 2966 | (eq (car-safe val) 'error) | 2966 | (eq (car-safe val) 'error) |
| @@ -3116,7 +3116,7 @@ calc-kill calc-kill-region calc-yank)))) | |||
| 3116 | (concat (substring (symbol-name (car a)) 9) | 3116 | (concat (substring (symbol-name (car a)) 9) |
| 3117 | "(" (math-vector-to-string (nth 1 a) t) ")")) | 3117 | "(" (math-vector-to-string (nth 1 a) t) ")")) |
| 3118 | (t | 3118 | (t |
| 3119 | (let ((op (math-assq2 (car a) math-standard-opers))) | 3119 | (let ((op (math-assq2 (car a) (math-standard-ops)))) |
| 3120 | (cond ((and op (= (length a) 3)) | 3120 | (cond ((and op (= (length a) 3)) |
| 3121 | (if (> prec (min (nth 2 op) (nth 3 op))) | 3121 | (if (> prec (min (nth 2 op) (nth 3 op))) |
| 3122 | (concat "(" (math-format-flat-expr a 0) ")") | 3122 | (concat "(" (math-format-flat-expr a 0) ")") |