aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2012-12-15 13:17:55 +0100
committerJoakim Verona2012-12-15 13:17:55 +0100
commitd179ffe12349689a347be9113299c0afcf99be36 (patch)
tree75cd5318ebcb07eb6123285e4c0d6eee132d4eef
parentc69b57e49b55064fca05150c90a396ca5cf4bde4 (diff)
parentf25f57bf4568ca7da7935ea72ccc4f81945bb904 (diff)
downloademacs-d179ffe12349689a347be9113299c0afcf99be36.tar.gz
emacs-d179ffe12349689a347be9113299c0afcf99be36.zip
auto upstream
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/misc.texi2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3a28e52a4d1..71014647c1f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12012-12-15 Juri Linkov <juri@jurta.org>
2
3 * misc.texi (Recursive Edit): Add a link to "Query Replace".
4 (Bug#13181)
5
12012-12-10 Dani Moncayo <dmoncayo@gmail.com> 62012-12-10 Dani Moncayo <dmoncayo@gmail.com>
2 7
3 * killing.texi (Deletion): Doc fix (Bug#12748). 8 * killing.texi (Deletion): Doc fix (Bug#12748).
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index c9d085a18f8..e970d7f75d2 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2180,7 +2180,7 @@ commands to perform arbitrary editing while in the middle of another
2180Emacs command. For example, when you type @kbd{C-r} inside of a 2180Emacs command. For example, when you type @kbd{C-r} inside of a
2181@code{query-replace}, you enter a recursive edit in which you can change 2181@code{query-replace}, you enter a recursive edit in which you can change
2182the current buffer. On exiting from the recursive edit, you go back to 2182the current buffer. On exiting from the recursive edit, you go back to
2183the @code{query-replace}. 2183the @code{query-replace}. @xref{Query Replace}.
2184 2184
2185@kindex C-M-c 2185@kindex C-M-c
2186@findex exit-recursive-edit 2186@findex exit-recursive-edit