comparison lisp/calc/calc-lang.el @ 90979:988f1edc9674

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
author Miles Bader <miles@gnu.org>
date Mon, 09 Jul 2007 08:00:55 +0000
parents e6fdae9180d4 3e0c2ded3e4a
children f55f9811f5d7
comparison
equal deleted inserted replaced
90978:f866074aedc4 90979:988f1edc9674
33 (require 'calc-macs) 33 (require 'calc-macs)
34 34
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)
42 calc-language-input-filter (get lang 'math-input-filter) 42 calc-language-input-filter (get lang 'math-input-filter)
43 calc-language-output-filter (get lang 'math-output-filter) 43 calc-language-output-filter (get lang 'math-output-filter)
1223 h math-rb-v1 (1+ h) v) 1223 h math-rb-v1 (1+ h) v)
1224 (math-read-big-emptyp 1224 (math-read-big-emptyp
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)
1232 h)) 1232 h))
1233 (setq widest '("2x" * 196 195))))) 1233 (setq widest '("2x" * 196 195)))))