[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/doc/misc/calc.texi,v
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] Changes to emacs/doc/misc/calc.texi,v |
Date: |
Wed, 23 Jul 2008 02:57:33 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jay Belanger <jpb> 08/07/23 02:57:32
Index: calc.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/misc/calc.texi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- calc.texi 13 Jul 2008 04:50:39 -0000 1.21
+++ calc.texi 23 Jul 2008 02:57:31 -0000 1.22
@@ -23,6 +23,7 @@
@alias expr=math
@alias tfn=code
@alias mathit=expr
address@hidden summarykey=key
@macro cpi{}
@address@hidden
@end macro
@@ -39,6 +40,9 @@
@alias expr=samp
@alias tfn=t
@alias mathit=i
address@hidden summarykey{ky}
+\ky\
address@hidden macro
@macro cpi{}
@expr{pi}
@end macro
@@ -10024,9 +10028,9 @@
@pindex calc-algebraic-entry
@cindex Algebraic notation
@cindex Formulas, entering
-Calculations can also be entered in algebraic form. This is accomplished
-by typing the apostrophe key, ', followed by the expression in
-standard format:
+The @kbd{'} (@code{calc-algebraic-entry}) command can be used to enter
+calculations in algebraic form. This is accomplished by typing the
+apostrophe key, ', followed by the expression in standard format:
@example
' 2+3*4 @key{RET}.
@@ -10042,9 +10046,9 @@
clear previous results off the stack.
You can press the apostrophe key during normal numeric entry to switch
-the half-entered number into Algebraic entry mode. One reason to do this
-would be to use the full Emacs cursor motion and editing keys, which are
-available during algebraic entry but not during numeric entry.
+the half-entered number into Algebraic entry mode. One reason to do
+this would be to fix a typo, as the full Emacs cursor motion and editing
+keys are available during algebraic entry but not during numeric entry.
In the same vein, during either numeric or algebraic entry you can
press @kbd{`} (backquote) to switch to @code{calc-edit} mode, where
@@ -11842,11 +11846,12 @@
@pindex calc-edit
@pindex calc-edit-finish
@cindex Editing the stack with Emacs
-The backquote, @kbd{`} (@code{calc-edit}) command creates a temporary
-buffer (@samp{*Calc Edit*}) for editing the top-of-stack value using
-regular Emacs commands. With a numeric prefix argument, it edits the
-specified number of stack entries at once. (An argument of zero edits
-the entire stack; a negative argument edits one specific stack entry.)
+The @kbd{`} (@code{calc-edit}) command creates a temporary buffer
+(@samp{*Calc Edit*}) for editing the top-of-stack value using regular
+Emacs commands. Note that @kbd{`} is a backquote, not a quote. With a
+numeric prefix argument, it edits the specified number of stack entries
+at once. (An argument of zero edits the entire stack; a negative
+argument edits one specific stack entry.)
When you are done editing, press @kbd{C-c C-c} to finish and return
to Calc. The @key{RET} and @key{LFD} keys also work to finish most
@@ -34842,7 +34847,7 @@
@defvarx calc-embedded-open-close-formula-alist
See @ref{Customizing Embedded address@hidden
The variables @code{calc-embedded-open-formula} and
address@hidden control the region that Calc will
address@hidden control the region that Calc will
activate as a formula when Embedded mode is entered with @kbd{C-x * e}.
They are regular expressions;
Calc normally scans backward and forward in the buffer for the
@@ -35172,14 +35177,14 @@
@r{ a@: M-% @: @: @:percent@:(a) a%}
@c
address@hidden ... a@: @key{RET} @: @: 1 @:@:... a a}
address@hidden ... a@: @key{SPC} @: @: 1 @:@:... a a}
address@hidden a b@: @key{TAB} @: @: 3 @:@:... b a}
address@hidden a b c@: address@hidden @: @: 3 @:@:... b c
a}
address@hidden a b@: @key{LFD} @: @: 1 @:@:... a b a}
address@hidden ... a@: @key{DEL} @: @: 1 @:@:...}
address@hidden a b@: address@hidden @: @: 1 @:@:... b}
address@hidden @: address@hidden @: @: 4
@:calc-last-args@:}
address@hidden ... a@: @summarykey{RET} @: @: 1
@:@:... a a}
address@hidden ... a@: @summarykey{SPC} @: @: 1
@:@:... a a}
address@hidden a b@: @summarykey{TAB} @: @: 3 @:@:... b
a}
address@hidden a b c@: address@hidden @: @: 3 @:@:... b c
a}
address@hidden a b@: @summarykey{LFD} @: @: 1 @:@:... a
b a}
address@hidden ... a@: @summarykey{DEL} @: @: 1
@:@:...}
address@hidden a b@: address@hidden @: @: 1 @:@:... b}
address@hidden @: address@hidden @: @: 4
@:calc-last-args@:}
@r{ a@: ` @:editing @: 1,30 @:calc-edit@:}
@c
@@ -35411,8 +35416,8 @@
@r{ @: d [ @: @: 4 @:calc-truncate-up@:}
@r{ @: d ] @: @: 4 @:calc-truncate-down@:}
@r{ @: d " @: @: 12,50 @:calc-display-strings@:}
address@hidden @: d @key{SPC} @: @:
@:calc-refresh@:}
address@hidden @: d @key{RET} @: @: 1
@:calc-refresh-top@:}
address@hidden @: d @summarykey{SPC} @: @:
@:calc-refresh@:}
address@hidden @: d @summarykey{RET} @: @: 1
@:calc-refresh-top@:}
@c
@r{ @: d 0 @: @: 50 @:calc-decimal-radix@:}
@@ -35549,8 +35554,8 @@
@c
@r{ @: j 1-9 @: @: @:calc-select-part@:}
address@hidden @: j @key{RET} @: @: 27
@:calc-copy-selection@:}
address@hidden @: j @key{DEL} @: @: 27
@:calc-del-selection@:}
address@hidden @: j @summarykey{RET} @: @: 27
@:calc-copy-selection@:}
address@hidden @: j @summarykey{DEL} @: @: 27
@:calc-del-selection@:}
@r{ @: j ' @:formula @: 27 @:calc-enter-selection@:}
@r{ @: j ` @:editing @: 27,30 @:calc-edit-selection@:}
@r{ @: j " @: @: 7,27 @:calc-sel-expand-formula@:}