summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi24
2 files changed, 24 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8db1f7fa23b..fc07ad6dc08 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-20 Jay Belanger <jay.p.belanger@gmail.com>
+
+ * calc.texi (Stack Manipulation Commands): Mention using the variable
+ `calc-context-sensitive-enter' for `calc-enter' and `calc-pop'.
+
2013-12-12 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (direntry): Use ssh but rsh.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 0154c82750a..425cd349784 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -11801,6 +11801,18 @@ Thus @kbd{M-@key{DEL}} by itself removes the second-from-top stack element,
leaving the first, third, fourth, and so on; @kbd{M-3 M-@key{DEL}} deletes
the third stack element.
+The above commands do not depend on the location of the cursor.
+If the customizable variable @code{calc-context-sensitive-enter} is
+non-@code{nil} (@pxref{Customizing Calc}), these commands will become
+context sensitive. For example, instead of duplicating the top of the stack,
+@key{RET} will copy the element at the cursor to the top of the
+stack. With a positive numeric prefix, a copy of the element at the
+cursor and the appropriate number of preceding elements will be placed
+at the top of the stack. A negative prefix will still duplicate the
+specified element of the stack regardless of the cursor position.
+Similarly, @key{DEL} will remove the corresponding elements from the
+stack.
+
@kindex @key{TAB}
@pindex calc-roll-down
To exchange the top two elements of the stack, press @key{TAB}
@@ -35697,11 +35709,13 @@ is @code{nil}.
@end defvar
@defvar calc-context-sensitive-enter
-The command @code{calc-enter} will typically duplicate the top of the
-stack. If @code{calc-context-sensitive-enter} is non-@code{nil},
-then the @code{calc-enter} will copy the element at the cursor to the
-top of the stack. The default value of
-@code{calc-context-sensitive-enter} is @code{nil}.
+The commands @code{calc-enter} and @code{calc-pop} will typically
+duplicate the top of the stack. If
+@code{calc-context-sensitive-enter} is non-@code{nil}, then the
+@code{calc-enter} will copy the element at the cursor to the
+top of the stack and @code{calc-pop} will delete the element at the
+cursor. The default value of @code{calc-context-sensitive-enter} is
+@code{nil}.
@end defvar
@defvar calc-undo-length