[Emacs-diffs] Changes to emacs/lisp/calc/calc.el,v

[Jay Belanger]

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

Index: calc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- calc.el     2 Sep 2008 08:49:01 -0000       1.116
+++ calc.el     10 Oct 2008 14:30:22 -0000      1.117
@@ -294,25 +294,18 @@
                 :value-type (list (regexp :tag "Opening formula delimiter")
                                   (regexp :tag "Closing formula delimiter"))))
 
-(defcustom calc-embedded-open-word
-  "^\\|[^-+0-9.eE]"
-  "*A regular expression for the opening delimiter of a formula used by 
calc-embedded-word."
+(defcustom calc-embedded-word-regexp
+  "[-+]?[0-9]+\\(\\.[0-9]+\\)?\\([eE][-+]?[0-9]+\\)?"
+  "A regular expression determining a word for calc-embedded-word."
   :group 'calc
   :type '(regexp))
 
-(defcustom calc-embedded-close-word
-  "$\\|[^-+0-9.eE]"
-  "*A regular expression for the closing delimiter of a formula used by 
calc-embedded-word."
-  :group 'calc
-  :type '(regexp))
-
-(defcustom calc-embedded-open-close-word-alist
+(defcustom calc-embedded-word-regexp-alist
   nil
-  "*Alist of major modes with pairs of word delimiters used by calc-embedded."
+  "*Alist of major modes with word regexps used by calc-embedded-word."
   :group 'calc
   :type '(alist :key-type (symbol :tag "Major mode")
-                :value-type (list (regexp :tag "Opening word delimiter")
-                                  (regexp :tag "Closing word delimiter"))))
+                :value-type (regexp :tag "Regexp for word")))
 
 (defcustom calc-embedded-open-plain
   "%%% "