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

[Jay Belanger]

Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.63 emacs/lisp/calc/calc.el:1.64
*** emacs/lisp/calc/calc.el:1.63        Sat Jul  9 03:41:40 2005
--- emacs/lisp/calc/calc.el     Mon Jul 11 06:43:39 2005
***************
*** 242,254 ****
    :type '(regexp))
  
  (defcustom calc-embedded-announce-formula-alist
!   '((texinfo-mode . "@c Embed\n\\(@c .*\n\\)*")
!     (nroff-mode   . "\\\\\"Embed\n\\(\\\\\" .*\n\\)*")
!     (pascal-mode  . "{Embed}\n\\({.*}\n\\)*")
      (c-mode       . "/\\*Embed\\*/\n\\(/\\* .*\\*/\n\\)*")
!     (c++-mode     . "//Embed\n\\(// .*\n\\)*")
      (fortran-mode . "C Embed\n\\(C .*\n\\)*")
!     (f90-mode     . "!Embed\n\\(! .*\n\\)*"))
    "*Alist of major modes with appropriate values for 
`calc-embedded-announce-formula'."
    :group 'calc
    :type '(alist :key-type (symbol :tag "Major mode")
--- 242,258 ----
    :type '(regexp))
  
  (defcustom calc-embedded-announce-formula-alist
!   '((c++-mode     . "//Embed\n\\(// .*\n\\)*")
      (c-mode       . "/\\*Embed\\*/\n\\(/\\* .*\\*/\n\\)*")
!     (f90-mode     . "!Embed\n\\(! .*\n\\)*")
      (fortran-mode . "C Embed\n\\(C .*\n\\)*")
!     (html-helper-mode . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*")
!     (html-mode    . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*")
!     (nroff-mode   . "\\\\\"Embed\n\\(\\\\\" .*\n\\)*")
!     (pascal-mode  . "{Embed}\n\\({.*}\n\\)*")
!     (sgml-mode    . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*")
!     (xml-mode     . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*")
!     (texinfo-mode . "@c Embed\n\\(@c .*\n\\)*"))
    "*Alist of major modes with appropriate values for 
`calc-embedded-announce-formula'."
    :group 'calc
    :type '(alist :key-type (symbol :tag "Major mode")
***************
*** 310,322 ****
    :type '(string))
  
  (defcustom calc-embedded-open-close-plain-alist
!   '((texinfo-mode "@c %% "   " %%\n")
!     (nroff-mode   "\\\" %% " " %%\n")
!     (pascal-mode  "{%% "    " %%}\n")
      (c-mode       "/* %% "   " %% */\n")
!     (c++-mode     "// %% "   " %%\n")
      (fortran-mode "C %% "    " %%\n")
!     (f90-mode     "! %% "    " %%\n"))
    "*Alist of major modes with pairs of delimiters for \"plain\" formulas."
    :group 'calc
    :type '(alist :key-type (symbol :tag "Major mode")
--- 314,330 ----
    :type '(string))
  
  (defcustom calc-embedded-open-close-plain-alist
!   '((c++-mode     "// %% "   " %%\n")
      (c-mode       "/* %% "   " %% */\n")
!     (f90-mode     "! %% "    " %%\n")
      (fortran-mode "C %% "    " %%\n")
!     (html-helper-mode "<!-- %% " " %% -->\n")
!     (html-mode "<!-- %% " " %% -->\n")
!     (nroff-mode   "\\\" %% " " %%\n")
!     (pascal-mode  "{%% "    " %%}\n")
!     (sgml-mode     "<!-- %% " " %% -->\n")
!     (xml-mode     "<!-- %% " " %% -->\n")
!     (texinfo-mode "@c %% "   " %%\n"))
    "*Alist of major modes with pairs of delimiters for \"plain\" formulas."
    :group 'calc
    :type '(alist :key-type (symbol :tag "Major mode")
***************
*** 358,370 ****
    :type '(string))
  
  (defcustom calc-embedded-open-close-mode-alist
!   '((texinfo-mode "@c "   "\n")
!     (nroff-mode   "\\\" " "\n")
!     (pascal-mode  "{ "    " }\n")
      (c-mode       "/* "   " */\n")
!     (c++-mode     "// "   "\n")
      (fortran-mode "C "    "\n")
!     (f90-mode     "! "    "\n"))
    "*Alist of major modes with pairs of strings to delimit annotations."
    :group 'calc
    :type '(alist :key-type (symbol :tag "Major mode")
--- 366,382 ----
    :type '(string))
  
  (defcustom calc-embedded-open-close-mode-alist
!   '((c++-mode     "// "   "\n")
      (c-mode       "/* "   " */\n")
!     (f90-mode     "! "    "\n")
      (fortran-mode "C "    "\n")
!     (html-helper-mode "<!-- " " -->\n")
!     (html-mode    "<!-- " " -->\n")
!     (nroff-mode   "\\\" " "\n")
!     (pascal-mode  "{ "    " }\n")
!     (sgml-mode    "<!-- " " -->\n")
!     (xml-mode     "<!-- " " -->\n")
!     (texinfo-mode "@c "   "\n"))
    "*Alist of major modes with pairs of strings to delimit annotations."
    :group 'calc
    :type '(alist :key-type (symbol :tag "Major mode")