(calc-embedded-language-alist): Remove.

(calc-embedded-find-modes): Use calc-language-alist instead of
calc-embedded-language-alist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85451bcad302ade9d85e4f14e78213216d345d2c..35df542ba9a2d61c4875fc68c7d46b4289dc5071 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-11  Jay Belanger  <belanger@truman.edu>
+
+       * calc/calc.el (calc-language-alist): New variable.
+       * calc/calc-embed.el (calc-embedded-language-alist): Remove.
+       (calc-embedded-find-modes): Use calc-language-alist instead of
+       calc-embedded-language-alist.
+
 2005-03-11  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
        * calendar/calendar.el (calendar-redrawing): New internal

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 3ad42037b507a278e9ea82a56cfdc959cde82b00..f1a273f7cf33427052b12d648865519586a02291 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -677,18 +677,6 @@ The command \\[yank] can retrieve it from there."
     (setq calc-embedded-globals (cons t modes))
     (goto-char save-pt)))
 
-(defvar calc-embedded-language-alist
-  '((latex-mode . latex)
-    (tex-mode   . tex)
-    (plain-tex-mode . tex)
-    (context-mode . tex)
-    (nroff-mode . eqn)
-    (pascal-mode . pascal)
-    (c-mode . c)
-    (c++-mode . c)
-    (fortran-mode . fortran)
-    (f90-mode . fortran)))
-
 (defun calc-embedded-find-modes ()
   (let ((case-fold-search nil)
        (save-pt (point))
@@ -737,7 +725,7 @@ The command \\[yank] can retrieve it from there."
       (backward-char 6))
     (goto-char save-pt)
     (unless (assq 'the-language modes)
-      (let ((lang (assoc major-mode calc-embedded-language-alist)))
+      (let ((lang (assoc major-mode calc-language-alist)))
         (if lang
             (setq modes (cons (cons 'the-language (cdr lang))
                               modes)))))