summaryrefslogtreecommitdiff
path: root/doc/emacs/fixit.texi
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-05-05 12:32:58 +0800
committerChong Yidong <cyd@gnu.org>2012-05-05 12:32:58 +0800
commiteceeb5fca618f3bc0743c2388148dd758229c7c9 (patch)
tree314434b14014363326ec7ce2868c3b86af4d97c3 /doc/emacs/fixit.texi
parent248da2f497e8865e8bebb0e3adb9184ab36e95f2 (diff)
parentbe4e7c155b6922dd6105f4be57164210c3441f37 (diff)
downloademacs-eceeb5fca618f3bc0743c2388148dd758229c7c9.tar.gz
Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org
Diffstat (limited to 'doc/emacs/fixit.texi')
-rw-r--r--doc/emacs/fixit.texi9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 85fac2b146b..2857e2b1af6 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -8,9 +8,9 @@
@cindex mistakes, correcting
In this chapter we describe commands that are useful when you catch
-a mistake while editing. The most fundamental command for correcting
-erroneous editing is the undo command @kbd{C-/} (which is also bound
-to @kbd{C-x u} and @kbd{C-_}). This undoes a single command, or a
+a mistake while editing. The most fundamental of these commands is
+the undo command @kbd{C-/} (also bound to @kbd{C-x u} and @kbd{C-_}).
+This undoes a single command, or a
part of a command (as in the case of @code{query-replace}), or several
consecutive character insertions. Consecutive repetitions of
@kbd{C-/} undo earlier and earlier changes, back to the limit of the
@@ -60,7 +60,6 @@ beginners to remember: @samp{u} stands for ``undo''. It is also bound
to @kbd{C-_} because typing @kbd{C-/} on some text terminals actually
enters @kbd{C-_}.}. This undoes the most recent change in the buffer,
and moves point back to where it was before that change.
-
Consecutive repetitions of @kbd{C-/} (or its aliases) undo earlier
and earlier changes in the current buffer. If all the recorded
changes have already been undone, the undo command signals an error.
@@ -75,7 +74,7 @@ changes you have undone, type @kbd{C-f} or any other command that
harmlessly breaks the sequence of undoing; then type @kbd{C-/} to undo
the undo command.
- On the other hand, if you want to resume undoing, without redoing
+ Alternatively, if you want to resume undoing, without redoing
previous undo commands, use @kbd{M-x undo-only}. This is like
@code{undo}, but will not redo changes you have just undone.