diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
| commit | 1011c48763982d02797a7058556d29f639f6efca (patch) | |
| tree | 5f1b7529b4cc483b73475b89245633c5848b8a5e /lisp/calc/calc-lang.el | |
| parent | 6f06dac7b57b8d73f4b26a855cd9862630192029 (diff) | |
| parent | 69e4c7c4bacf19e9e004605fcb1c067e478beffe (diff) | |
| download | emacs-1011c48763982d02797a7058556d29f639f6efca.tar.gz emacs-1011c48763982d02797a7058556d29f639f6efca.tar.bz2 emacs-1011c48763982d02797a7058556d29f639f6efca.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-805)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
Diffstat (limited to 'lisp/calc/calc-lang.el')
| -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 @@ ;;; Alternate entry/display languages. (defun calc-set-language (lang &optional option no-refresh) - (setq math-expr-opers (or (get lang 'math-oper-table) math-standard-opers) + (setq math-expr-opers (or (get lang 'math-oper-table) (math-standard-ops)) math-expr-function-mapping (get lang 'math-function-table) math-expr-special-function-mapping (get lang 'math-special-function-table) math-expr-variable-mapping (get lang 'math-variable-table) @@ -1225,7 +1225,7 @@ h (1+ v) (1+ h) math-rb-v2) (string-match "<=\\|>=\\|\\+/-\\|!=\\|&&\\|||\\|:=\\|=>\\|." line h) (assoc (math-match-substring line 0) - math-standard-opers))) + (math-standard-ops)))) (and (>= (nth 2 widest) prec) (setq h (match-end 0))) (and (not (eq (string-match ",\\|;\\|\\.\\.\\|)\\|\\]\\|:" line h) |