# HG changeset patch # User Jay Belanger # Date 1121064219 0 # Node ID b036e189a4c03c9d79f1315d69b36de8f88b0a3f # Parent e34914bd46ccf7326412fb217cef41c36866212f (calc-embedded-announce-formula-alist) (calc-embedded-open-close-plain-alist) (calc-embedded-open-close-mode-alist): Added checks for additional major modes (due to Robert J. Chassell ). diff -r e34914bd46cc -r b036e189a4c0 lisp/calc/calc.el --- a/lisp/calc/calc.el Mon Jul 11 06:12:55 2005 +0000 +++ b/lisp/calc/calc.el Mon Jul 11 06:43:39 2005 +0000 @@ -242,13 +242,17 @@ :type '(regexp)) (defcustom calc-embedded-announce-formula-alist - '((texinfo-mode . "@c Embed\n\\(@c .*\n\\)*") + '((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 . "\n\\(\n\\)*") + (html-mode . "\n\\(\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\\)*")) + (sgml-mode . "\n\\(\n\\)*") + (xml-mode . "\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,13 +314,17 @@ :type '(string)) (defcustom calc-embedded-open-close-plain-alist - '((texinfo-mode "@c %% " " %%\n") + '((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") - (c-mode "/* %% " " %% */\n") - (c++-mode "// %% " " %%\n") - (fortran-mode "C %% " " %%\n") - (f90-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,13 +366,17 @@ :type '(string)) (defcustom calc-embedded-open-close-mode-alist - '((texinfo-mode "@c " "\n") + '((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") - (c-mode "/* " " */\n") - (c++-mode "// " "\n") - (fortran-mode "C " "\n") - (f90-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")