From 2e756d9bf2e396b6b8fd10e4e268a603bd25c5e9 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Fri, 10 Oct 2008 14:30:22 +0000 Subject: [PATCH] (calc-embedded-word-regexp, calc-embedded-word-regexp-alist): New variables. (calc-embedded-open-word, calc-embedded-close-word) (calc-embedded-open-close-word-alist): Remove unused variables. --- lisp/calc/calc.el | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 6666142200b..d49e2bd2aa3 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -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 "%%% " -- 2.39.5