mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-02-18 18:21:41 +01:00
parent f1e5dfdbe9 40b3b323f8
commit 2e615798a1
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/org.texi
View File

@ -1963,13 +1963,7 @@ item.
Org comes with a fast and intuitive table editor. Spreadsheet-like Org comes with a fast and intuitive table editor. Spreadsheet-like
calculations are supported using the Emacs @file{calc} package calculations are supported using the Emacs @file{calc} package
@ifinfo (@pxref{Top, Calc, , calc, Gnu Emacs Calculator Manual}).
(@pxref{Top,Calc,,Calc,Gnu Emacs Calculator Manual}).
@end ifinfo
@ifnotinfo
(see the Emacs Calculator manual for more information about the Emacs
calculator).
@end ifnotinfo
@menu @menu
* Built-in table editor:: Simple tables * Built-in table editor:: Simple tables
@ -2529,9 +2523,8 @@ A formula can be any algebraic expression understood by the Emacs
non-standard convention that @samp{/} has lower precedence than non-standard convention that @samp{/} has lower precedence than
@samp{*}, so that @samp{a/b*c} is interpreted as @samp{a/(b*c)}.} Before @samp{*}, so that @samp{a/b*c} is interpreted as @samp{a/(b*c)}.} Before
evaluation by @code{calc-eval} (@pxref{Calling Calc from evaluation by @code{calc-eval} (@pxref{Calling Calc from
Your Programs,calc-eval,Calling Calc from Your Lisp Programs,Calc,GNU Your Programs, calc-eval, Calling Calc from Your Lisp Programs, calc, GNU
Emacs Calc Manual}), Emacs Calc Manual}),
@c FIXME: The link to the Calc manual in HTML does not work.
variable substitution takes place according to the rules described above. variable substitution takes place according to the rules described above.
@cindex vectors, in table calculations @cindex vectors, in table calculations
The range vectors can be directly fed into the Calc vector functions The range vectors can be directly fed into the Calc vector functions
@ -14975,7 +14968,7 @@ checks for the availability of Calc by looking for the function
been installed properly. As of Emacs 22, Calc is part of the Emacs been installed properly. As of Emacs 22, Calc is part of the Emacs
distribution. Another possibility for interaction between the two distribution. Another possibility for interaction between the two
packages is using Calc for embedded calculations. @xref{Embedded Mode, packages is using Calc for embedded calculations. @xref{Embedded Mode,
, Embedded Mode, Calc, GNU Emacs Calc Manual}. , Embedded Mode, calc, GNU Emacs Calc Manual}.
@item @file{constants.el} by Carsten Dominik @item @file{constants.el} by Carsten Dominik
@cindex @file{constants.el} @cindex @file{constants.el}
@cindex Dominik, Carsten @cindex Dominik, Carsten