aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2007-10-27 20:38:38 +0000
committerJay Belanger2007-10-27 20:38:38 +0000
commit0edd2970d2fe0e00490904a1d4054778ed0cc690 (patch)
treed210225e731ec8663faa0afbd647d17256eba900
parent7841a7ddd209209d6d6fb78c9e90dcac6c4bbda4 (diff)
downloademacs-0edd2970d2fe0e00490904a1d4054778ed0cc690.tar.gz
emacs-0edd2970d2fe0e00490904a1d4054778ed0cc690.zip
(Formulas, Composition Basics): Lower the precedence of negation.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi13
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 73677b121ee..6c7b4b60715 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12007-10-27 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc.texi (Formulas, Composition Basics): Lower the
4 precedence of negation.
5
12007-10-25 Jonathan Yavner <jyavner@member.fsf.org> 62007-10-25 Jonathan Yavner <jyavner@member.fsf.org>
2 7
3 * ses.texi (The Basics): Mention how to create a new spreadsheet. 8 * ses.texi (The Basics): Mention how to create a new spreadsheet.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index ee2dbfb5bc8..2441f0c1166 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -11579,8 +11579,7 @@ with their equivalent function names, are:
11579 11579
11580postfix @samp{%} [@code{percent}] (as in @samp{25% = 0.25}); 11580postfix @samp{%} [@code{percent}] (as in @samp{25% = 0.25});
11581 11581
11582prefix @samp{+} and @samp{-} [@code{neg}] (as in @samp{-x}) 11582prefix @samp{!} [@code{lnot}] (logical ``not,'' as in @samp{!x});
11583and prefix @samp{!} [@code{lnot}] (logical ``not,'' as in @samp{!x});
11584 11583
11585@samp{+/-} [@code{sdev}] (the standard deviation symbol) and 11584@samp{+/-} [@code{sdev}] (the standard deviation symbol) and
11586@samp{mod} [@code{makemod}] (the symbol for modulo forms); 11585@samp{mod} [@code{makemod}] (the symbol for modulo forms);
@@ -11590,6 +11589,8 @@ and postfix @samp{!!} [@code{dfact}] (double factorial);
11590 11589
11591@samp{^} [@code{pow}] (raised-to-the-power-of); 11590@samp{^} [@code{pow}] (raised-to-the-power-of);
11592 11591
11592prefix @samp{+} and @samp{-} [@code{neg}] (as in @samp{-x});
11593
11593@samp{*} [@code{mul}]; 11594@samp{*} [@code{mul}];
11594 11595
11595@samp{/} [@code{div}], @samp{%} [@code{mod}] (modulo), and 11596@samp{/} [@code{div}], @samp{%} [@code{mod}] (modulo), and
@@ -14610,15 +14611,15 @@ The operator table used by normal and Big language modes has the
14610following precedences: 14611following precedences:
14611 14612
14612@example 14613@example
14613_ 1200 @r{(subscripts)} 14614_ 1200 @r{(subscripts)}
14614% 1100 @r{(as in n}%@r{)} 14615% 1100 @r{(as in n}%@r{)}
14615- 1000 @r{(as in }-@r{n)} 14616! 1000 @r{(as in }!@r{n)}
14616! 1000 @r{(as in }!@r{n)}
14617mod 400 14617mod 400
14618+/- 300 14618+/- 300
14619!! 210 @r{(as in n}!!@r{)} 14619!! 210 @r{(as in n}!!@r{)}
14620! 210 @r{(as in n}!@r{)} 14620! 210 @r{(as in n}!@r{)}
14621^ 200 14621^ 200
14622- 197 @r{(as in }-@r{n)}
14622* 195 @r{(or implicit multiplication)} 14623* 195 @r{(or implicit multiplication)}
14623/ % \ 190 14624/ % \ 190
14624+ - 180 @r{(as in a}+@r{b)} 14625+ - 180 @r{(as in a}+@r{b)}