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

[Jay Belanger]

Index: emacs/lisp/calc/calc-embed.el
diff -c emacs/lisp/calc/calc-embed.el:1.23 emacs/lisp/calc/calc-embed.el:1.24
*** emacs/lisp/calc/calc-embed.el:1.23  Thu Mar 24 13:34:53 2005
--- emacs/lisp/calc/calc-embed.el       Fri Apr  1 21:44:21 2005
***************
*** 1,6 ****
  ;;; calc-embed.el --- embed Calc in a buffer
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
--- 1,6 ----
  ;;; calc-embed.el --- embed Calc in a buffer
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, 
Inc.
  
  ;; Author: David Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
***************
*** 48,95 ****
  (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\\|address@hidden|^\\.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\\|address@hidden|^\\.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.")
! 
  
  (defconst calc-embedded-mode-vars '(("precision" . calc-internal-prec)
                                    ("word-size" . calc-word-size)
--- 48,65 ----
  (defvar calc-embedded-some-active nil)
  (make-variable-buffer-local 'calc-embedded-some-active)
  
! ;; 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)