diff options
| -rw-r--r-- | lisp/calc/calc-lang.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index 79c33b473c3..c009dbe18aa 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | ;;; Alternate entry/display languages. | 35 | ;;; Alternate entry/display languages. |
| 36 | 36 | ||
| 37 | (defun calc-set-language (lang &optional option no-refresh) | 37 | (defun calc-set-language (lang &optional option no-refresh) |
| 38 | (setq math-expr-opers (or (get lang 'math-oper-table) math-standard-opers) | 38 | (setq math-expr-opers (or (get lang 'math-oper-table) (math-standard-ops)) |
| 39 | math-expr-function-mapping (get lang 'math-function-table) | 39 | math-expr-function-mapping (get lang 'math-function-table) |
| 40 | math-expr-special-function-mapping (get lang 'math-special-function-table) | 40 | math-expr-special-function-mapping (get lang 'math-special-function-table) |
| 41 | math-expr-variable-mapping (get lang 'math-variable-table) | 41 | math-expr-variable-mapping (get lang 'math-variable-table) |
| @@ -1225,7 +1225,7 @@ | |||
| 1225 | h (1+ v) (1+ h) math-rb-v2) | 1225 | h (1+ v) (1+ h) math-rb-v2) |
| 1226 | (string-match "<=\\|>=\\|\\+/-\\|!=\\|&&\\|||\\|:=\\|=>\\|." line h) | 1226 | (string-match "<=\\|>=\\|\\+/-\\|!=\\|&&\\|||\\|:=\\|=>\\|." line h) |
| 1227 | (assoc (math-match-substring line 0) | 1227 | (assoc (math-match-substring line 0) |
| 1228 | math-standard-opers))) | 1228 | (math-standard-ops)))) |
| 1229 | (and (>= (nth 2 widest) prec) | 1229 | (and (>= (nth 2 widest) prec) |
| 1230 | (setq h (match-end 0))) | 1230 | (setq h (match-end 0))) |
| 1231 | (and (not (eq (string-match ",\\|;\\|\\.\\.\\|)\\|\\]\\|:" line h) | 1231 | (and (not (eq (string-match ",\\|;\\|\\.\\.\\|)\\|\\]\\|:" line h) |