aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-help.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8687a5b6199..1da54994989 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-05-10 Jay Belanger <belanger@truman.edu>
2
3 * calc/calc-help.el (calc-m-prefix-help): Add mention of
4 preserving embedded modes.
5
12005-05-10 Richard M. Stallman <rms@gnu.org> 62005-05-10 Richard M. Stallman <rms@gnu.org>
2 7
3 * progmodes/sh-script.el (sh-indent-for-do): Default to 0. 8 * progmodes/sh-script.el (sh-indent-for-do): Default to 0.
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 2a89bb2b883..da2b8434c17 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -630,7 +630,7 @@ C-w Describe how there is no warranty for Calc."
630 (interactive) 630 (interactive)
631 (calc-do-prefix-help 631 (calc-do-prefix-help
632 '("Deg, Rad, HMS; Frac; Polar; Inf; Alg, Total; Symb; Vec/mat" 632 '("Deg, Rad, HMS; Frac; Polar; Inf; Alg, Total; Symb; Vec/mat"
633 "Working; Xtensions; Mode-save" 633 "Working; Xtensions; Mode-save; preserve Embedded modes"
634 "SHIFT + Shifted-prefixes, mode-Filename; Record; reCompute" 634 "SHIFT + Shifted-prefixes, mode-Filename; Record; reCompute"
635 "SHIFT + simplify: Off, Num, Default, Bin, Alg, Ext, Units") 635 "SHIFT + simplify: Off, Num, Default, Bin, Alg, Ext, Units")
636 "mode" ?m)) 636 "mode" ?m))