aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calc/calc-misc.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a07d4fa2cde..f0ac21bac65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-12-16 Andreas Schwab <schwab@linux-m68k.org>
2
3 * calc/calc-misc.el (calc-help): Avoid wrapping help message.
4
12011-12-13 Sam Steingold <sds@gnu.org> 52011-12-13 Sam Steingold <sds@gnu.org>
2 6
3 * man.el (Man-getpage-in-background): When running under a 7 * man.el (Man-getpage-in-background): When running under a
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 6d034927ae0..d8bdc614e67 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -219,10 +219,10 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
219 (let ((msgs 219 (let ((msgs
220 '("Press `h' for complete help; press `?' repeatedly for a summary" 220 '("Press `h' for complete help; press `?' repeatedly for a summary"
221 "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit" 221 "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit"
222 "Letter keys: SHIFT + Undo, reDo; Keep-args; Inverse, Hyperbolic, Option" 222 "Letter keys: SHIFT + Undo, reDo; Inverse, Hyperbolic, Option"
223 "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB" 223 "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB"
224 "Letter keys: SHIFT + Floor, Round; Abs, conJ, arG; Pi" 224 "Letter keys: SHIFT + Floor, Round; Abs, conJ, arG; Pi"
225 "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro" 225 "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args"
226 "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)" 226 "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)"
227 "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)" 227 "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)"
228 "Other keys: ' (alg-entry), = (eval), ` (edit); M-RET (last-args)" 228 "Other keys: ' (alg-entry), = (eval), ` (edit); M-RET (last-args)"