[Emacs-diffs] Changes to emacs/doc/misc/calc.texi,v

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      08/10/10 14:54:13

Index: calc.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/misc/calc.texi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- calc.texi   30 Sep 2008 02:41:39 -0000      1.24
+++ calc.texi   10 Oct 2008 14:54:11 -0000      1.25
@@ -953,9 +953,9 @@
 and keyboard will revert to the way they were before.
 
 The related command @kbd{C-x * w} operates on a single word, which
-generally means a single number, inside text.  It uses any
-non-numeric characters rather than blank lines to delimit the
-formula it reads.  Here's an example of its use:
+generally means a single number, inside text.  It searches for an
+expression which ``looks'' like a number containing the point.
+Here's an example of its use:
 
 @smallexample
 A slope of one-third corresponds to an angle of 1 degrees.
@@ -30748,11 +30748,10 @@
 of describing a blank line that is more appropriate for this
 case).
 
address@hidden calc-embedded-open-word
address@hidden calc-embedded-close-word
-The @code{calc-embedded-open-word} and @code{calc-embedded-close-word}
-variables are similar expressions used when you type @kbd{C-x * w}
-instead of @kbd{C-x * e} to enable Embedded mode.
address@hidden calc-embedded-word-regexp
+The @code{calc-embedded-word-regexp} variable holds a regular expression
+used to define an expression to look for (a ``word'') when you type
address@hidden * w} to enable Embedded mode.
 
 @vindex calc-embedded-open-plain
 The @code{calc-embedded-open-plain} variable is a string which
@@ -34883,26 +34882,21 @@
 @code{nil}.
 @end defvar
 
address@hidden  calc-embedded-open-word
address@hidden calc-embedded-close-word
address@hidden calc-embedded-open-close-word-alist
address@hidden  calc-embedded-word-regexp
address@hidden calc-embedded-word-regexp-alist
 See @ref{Customizing Embedded address@hidden
-The variables @code{calc-embedded-open-word} and
address@hidden control the region that Calc will
-activate when Embedded mode is entered with @kbd{C-x * w}.  They are
-regular expressions.
-
-The default values of @code{calc-embedded-open-word} and
address@hidden are @code{"^\\|[^-+0-9.eE]"} and 
address@hidden"$\\|[^-+0-9.eE]"} respectively.
-
-The variable @code{calc-embedded-open-close-word-alist} is used to
-set @code{calc-embedded-open-word} and
address@hidden to different regular
-expressions depending on the major mode of the editing buffer.
+The variable @code{calc-embedded-word-regexp} determines the expression
+that Calc will activate when Embedded mode is entered with @kbd{C-x *
+w}.  It is a regular expressions.
+
+The default value of @code{calc-embedded-word-regexp} is
address@hidden"[-+]?[0-9]+\\(\\.[0-9]+\\)?\\([eE][-+]?[0-9]+\\)?"}.
+
+The variable @code{calc-embedded-word-regexp-alist} is used to
+set @code{calc-embedded-word-regexp} to a different regular
+expression depending on the major mode of the editing buffer.
 It consists of a list of lists of the form 
address@hidden(@var{MAJOR-MODE}  @var{OPEN-WORD-REGEXP}
address@hidden)}, and its default value is
address@hidden(@var{MAJOR-MODE}  @var{WORD-REGEXP})}, and its default value is
 @code{nil}.
 @end defvar