aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChristopher Schmidt2014-10-28 19:37:37 -0500
committerJay Belanger2014-10-28 19:37:37 -0500
commit3f3b46d49bbf90ebbaa66c42d0ccffb5c9621eb7 (patch)
tree038d70f578436248984d5e462cb8e4440bcd47b3 /doc
parente4bf229c3c94cf93a013f97fadea724d5dd85a45 (diff)
downloademacs-3f3b46d49bbf90ebbaa66c42d0ccffb5c9621eb7.tar.gz
emacs-3f3b46d49bbf90ebbaa66c42d0ccffb5c9621eb7.zip
doc/misc/calc.texi (Quick Calculator): Mention prefix argument of
`quick-calc'. etc/NEWS: Mention prefix argument of `quick-calc'. lisp/calc/calc.el (quick-calc): lisp/calc/calc-aent.el (calc-do-quick-calc): New argument INSERT.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi7
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 462e7b6bbd3..c5daf44af91 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12014-10-28 Christopher Schmidt <ch@ristopher.com>
2
3 * calc.texi (Quick Calculator): Mention prefix argument of
4 `quick-calc'.
5
12014-10-26 Eric S. Raymond <esr@thyrsus.com> 62014-10-26 Eric S. Raymond <esr@thyrsus.com>
2 7
3 * efaq-w32.texi: Neutralized language specific to a repository type. 8 * efaq-w32.texi: Neutralized language specific to a repository type.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 2e9d71acd4f..ede9598c281 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -10168,9 +10168,10 @@ to yank the result into the next @kbd{C-x * q} input line as a more
10168explicit alternative to @kbd{$} notation, or to yank the result 10168explicit alternative to @kbd{$} notation, or to yank the result
10169into the Calculator stack after typing @kbd{C-x * c}. 10169into the Calculator stack after typing @kbd{C-x * c}.
10170 10170
10171If you finish your formula by typing @key{LFD} (or @kbd{C-j}) instead 10171If you give a prefix argument to @kbd{C-x * q} or finish your formula
10172of @key{RET}, the result is inserted immediately into the current 10172by typing @key{LFD} (or @kbd{C-j}) instead of @key{RET}, the result is
10173buffer rather than going into the kill ring. 10173inserted immediately into the current buffer rather than going into
10174the kill ring.
10174 10175
10175Quick Calculator results are actually evaluated as if by the @kbd{=} 10176Quick Calculator results are actually evaluated as if by the @kbd{=}
10176key (which replaces variable names by their stored values, if any). 10177key (which replaces variable names by their stored values, if any).