diff options
| author | Miles Bader <miles@gnu.org> | 2005-04-02 22:40:25 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-04-02 22:40:25 +0000 |
| commit | 4a2283bcc7998fef3788136a16a6c2b10df6fe6f (patch) | |
| tree | dc8199f604a6e5a2d57754d843773be6c88c4f36 /lisp/calc/calc-embed.el | |
| parent | 417294f4d1d8872d7a4a698de1a9650f18af3b37 (diff) | |
| parent | ab77efd0e55c661ea8fd45df28f2a39d0c46fbd8 (diff) | |
| download | emacs-4a2283bcc7998fef3788136a16a6c2b10df6fe6f.tar.gz emacs-4a2283bcc7998fef3788136a16a6c2b10df6fe6f.tar.bz2 emacs-4a2283bcc7998fef3788136a16a6c2b10df6fe6f.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-33
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 223-227)
- Update from CVS
Diffstat (limited to 'lisp/calc/calc-embed.el')
| -rw-r--r-- | lisp/calc/calc-embed.el | 56 |
1 files changed, 13 insertions, 43 deletions
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index 2d2f66b1ebf..4f45419c136 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -1,6 +1,6 @@ ;;; calc-embed.el --- embed Calc in a buffer -;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -48,48 +48,18 @@ (defvar calc-embedded-some-active nil) (make-variable-buffer-local 'calc-embedded-some-active) -(defvar calc-embedded-open-formula "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n" - "*A regular expression for the opening delimiter of a formula used by -calc-embedded.") - -(defvar calc-embedded-close-formula "\\'\\|\n$\\|\\$\\$?\\|\\\\]\\|^\\\\end[^{].*\n\\|^\\\\end{.*[^x]}.*\n\\|^@.*\n\\|^\\.EN.*\n\\|\\\\)\\|\n%\n\\|^\\.\\\\\"\n" - "*A regular expression for the closing delimiter of a formula used by -calc-embedded.") - -(defvar calc-embedded-open-word "^\\|[^-+0-9.eE]" - "*A regular expression for the opening delimiter of a formula used by -calc-embedded-word.") - -(defvar calc-embedded-close-word "$\\|[^-+0-9.eE]" - "*A regular expression for the closing delimiter of a formula used by -calc-embedded-word.") - -(defvar calc-embedded-open-plain "%%% " - "*A string which is the opening delimiter for a \"plain\" formula. -If calc-show-plain mode is enabled, this is inserted at the front of -each formula.") - -(defvar calc-embedded-close-plain " %%%\n" - "*A string which is the closing delimiter for a \"plain\" formula. -See calc-embedded-open-plain.") - -(defvar calc-embedded-open-new-formula "\n\n" - "*A string which is inserted at front of formula by calc-embedded-new-formula.") - -(defvar calc-embedded-close-new-formula "\n\n" - "*A string which is inserted at end of formula by calc-embedded-new-formula.") - -(defvar calc-embedded-announce-formula "%Embed\n\\(% .*\n\\)*" - "*A regular expression which is sure to be followed by a calc-embedded formula." ) - -(defvar calc-embedded-open-mode "% " - "*A string which should precede calc-embedded mode annotations. -This is not required to be present for user-written mode annotations.") - -(defvar calc-embedded-close-mode "\n" - "*A string which should follow calc-embedded mode annotations. -This is not required to be present for user-written mode annotations.") - +;; The following variables are customizable and defined in calc.el. +(defvar calc-embedded-announce-formula) +(defvar calc-embedded-open-formula) +(defvar calc-embedded-close-formula) +(defvar calc-embedded-open-word) +(defvar calc-embedded-close-word) +(defvar calc-embedded-open-plain) +(defvar calc-embedded-close-plain) +(defvar calc-embedded-open-new-formula) +(defvar calc-embedded-close-new-formula) +(defvar calc-embedded-open-mode) +(defvar calc-embedded-close-mode) (defconst calc-embedded-mode-vars '(("precision" . calc-internal-prec) ("word-size" . calc-word-size) |