(calc-embedded-original-modes): New variable.

[gnu-emacs] / lisp / calc / calc-help.el

diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 087c42d295c51d6004688d7304bad1c8cc46fc70..dc7f0b17c1d609da6c6f78e226d5666d0db1e615 100644 (file)
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -178,15 +178,15 @@ C-w  Describe how there is no warranty for Calc."
                       (if (= (buffer-size) 0)
                           (progn
                             (message "Reading Calc summary from manual...")
-                            (save-window-excursion
-                              (save-excursion
-                                (calc-info-goto-node "Summary")
-                                (goto-char (point-min))
-                                (forward-line 1)
-                                (copy-to-buffer "*Calc Summary*"
-                                                (point) (point-max))
-                                 (if Info-history
-                                     (Info-last))))))
+                             (require 'info nil t)
+                             (with-temp-buffer
+                               (Info-mode)
+                               (Info-goto-node "(Calc)Summary")
+                               (goto-char (point-min))
+                               (forward-line 1)
+                               (copy-to-buffer "*Calc Summary*"
+                                               (point) (point-max)))
+                             (setq buffer-read-only t)))
                        (goto-char (point-min))
                        (setq case-fold-search nil)
                        (re-search-forward "^\\(.*\\)\\[\\.\\. a b")
@@ -593,7 +593,7 @@ C-w  Describe how there is no warranty for Calc."
      "Why; Line-nums, line-Breaks; <, =, > (justify); Plain"
      "\" (strings); Truncate, [, ]; SPC (refresh), RET, @"
      "SHIFT + language: Normal, One-line, Big, Unformatted"
-     "SHIFT + language: C, Pascal, Fortran; TeX, Eqn"
+     "SHIFT + language: C, Pascal, Fortran; TeX, LaTeX, Eqn"
      "SHIFT + language: Mathematica, W=Maple")
    "display" ?d))