Mercurial > emacs
changeset 98602:8bc022b29e81
(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.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Fri, 10 Oct 2008 14:30:22 +0000 |
| parents | c53a955375b8 |
| children | 2f77b9a9fd06 |
| files | lisp/calc/calc.el |
| diffstat | 1 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc.el Fri Oct 10 13:47:49 2008 +0000 +++ b/lisp/calc/calc.el Fri Oct 10 14:30:22 2008 +0000 @@ -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 "%%% "