diff options
| author | Jay Belanger | 2007-10-27 20:25:45 +0000 |
|---|---|---|
| committer | Jay Belanger | 2007-10-27 20:25:45 +0000 |
| commit | ca54ae34f4acd01b8b9a5ee2928f7c8c44841a2f (patch) | |
| tree | a208ad8884d10d21eb3306a6f763c9f295d20285 | |
| parent | c8d007440529122c1d30a40fc35c086dc54b544b (diff) | |
| download | emacs-ca54ae34f4acd01b8b9a5ee2928f7c8c44841a2f.tar.gz emacs-ca54ae34f4acd01b8b9a5ee2928f7c8c44841a2f.zip | |
(math-oper-table): Lower precedence of negation for C, TeX, and eqn.
| -rw-r--r-- | lisp/calc/calc-lang.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index efaf17ecae8..3871a1b0f09 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el | |||
| @@ -84,10 +84,10 @@ | |||
| 84 | (message "`C' language mode"))) | 84 | (message "`C' language mode"))) |
| 85 | 85 | ||
| 86 | (put 'c 'math-oper-table | 86 | (put 'c 'math-oper-table |
| 87 | '( ( "u+" ident -1 1000 ) | 87 | '( ( "u!" calcFunc-lnot -1 1000 ) |
| 88 | ( "u-" neg -1 1000 ) | ||
| 89 | ( "u!" calcFunc-lnot -1 1000 ) | ||
| 90 | ( "~" calcFunc-not -1 1000 ) | 88 | ( "~" calcFunc-not -1 1000 ) |
| 89 | ( "u+" ident -1 197 ) | ||
| 90 | ( "u-" neg -1 197 ) | ||
| 91 | ( "*" * 190 191 ) | 91 | ( "*" * 190 191 ) |
| 92 | ( "/" / 190 191 ) | 92 | ( "/" / 190 191 ) |
| 93 | ( "%" % 190 191 ) | 93 | ( "%" % 190 191 ) |
| @@ -328,9 +328,7 @@ | |||
| 328 | "LaTeX language mode with \\func(\\text{var}) and multiline matrices"))))) | 328 | "LaTeX language mode with \\func(\\text{var}) and multiline matrices"))))) |
| 329 | 329 | ||
| 330 | (put 'tex 'math-oper-table | 330 | (put 'tex 'math-oper-table |
| 331 | '( ( "u+" ident -1 1000 ) | 331 | '( ( "\\hat" calcFunc-hat -1 950 ) |
| 332 | ( "u-" neg -1 1000 ) | ||
| 333 | ( "\\hat" calcFunc-hat -1 950 ) | ||
| 334 | ( "\\check" calcFunc-check -1 950 ) | 332 | ( "\\check" calcFunc-check -1 950 ) |
| 335 | ( "\\tilde" calcFunc-tilde -1 950 ) | 333 | ( "\\tilde" calcFunc-tilde -1 950 ) |
| 336 | ( "\\acute" calcFunc-acute -1 950 ) | 334 | ( "\\acute" calcFunc-acute -1 950 ) |
| @@ -351,6 +349,8 @@ | |||
| 351 | ( "!" calcFunc-fact 210 -1 ) | 349 | ( "!" calcFunc-fact 210 -1 ) |
| 352 | ( "^" ^ 201 200 ) | 350 | ( "^" ^ 201 200 ) |
| 353 | ( "_" calcFunc-subscr 201 200 ) | 351 | ( "_" calcFunc-subscr 201 200 ) |
| 352 | ( "u+" ident -1 197 ) | ||
| 353 | ( "u-" neg -1 197 ) | ||
| 354 | ( "\\times" * 191 190 ) | 354 | ( "\\times" * 191 190 ) |
| 355 | ( "*" * 191 190 ) | 355 | ( "*" * 191 190 ) |
| 356 | ( "2x" * 191 190 ) | 356 | ( "2x" * 191 190 ) |
| @@ -575,9 +575,7 @@ | |||
| 575 | (message "Eqn language mode"))) | 575 | (message "Eqn language mode"))) |
| 576 | 576 | ||
| 577 | (put 'eqn 'math-oper-table | 577 | (put 'eqn 'math-oper-table |
| 578 | '( ( "u+" ident -1 1000 ) | 578 | '( ( "prime" (math-parse-eqn-prime) 950 -1 ) |
| 579 | ( "u-" neg -1 1000 ) | ||
| 580 | ( "prime" (math-parse-eqn-prime) 950 -1 ) | ||
| 581 | ( "prime" calcFunc-Prime 950 -1 ) | 579 | ( "prime" calcFunc-Prime 950 -1 ) |
| 582 | ( "dot" calcFunc-dot 950 -1 ) | 580 | ( "dot" calcFunc-dot 950 -1 ) |
| 583 | ( "dotdot" calcFunc-dotdot 950 -1 ) | 581 | ( "dotdot" calcFunc-dotdot 950 -1 ) |
| @@ -599,6 +597,8 @@ | |||
| 599 | ( "right ceil" closing 0 -1 ) | 597 | ( "right ceil" closing 0 -1 ) |
| 600 | ( "+-" sdev 300 300 ) | 598 | ( "+-" sdev 300 300 ) |
| 601 | ( "!" calcFunc-fact 210 -1 ) | 599 | ( "!" calcFunc-fact 210 -1 ) |
| 600 | ( "u+" ident -1 197 ) | ||
| 601 | ( "u-" neg -1 197 ) | ||
| 602 | ( "times" * 191 190 ) | 602 | ( "times" * 191 190 ) |
| 603 | ( "*" * 191 190 ) | 603 | ( "*" * 191 190 ) |
| 604 | ( "2x" * 191 190 ) | 604 | ( "2x" * 191 190 ) |