Merge from emacs--rel--22

Revision: [email protected]/emacs--devo--0--patch-1021

4 files changed, 20 insertions, 6 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index fd1ace2e69..e7add8acfa 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-26  Richard Stallman  <[email protected]>
+
+	* maintaining.texi (Tags): Delete redundant index entry.
+
+2008-01-26  Eli Zaretskii  <[email protected]>
+
+	* programs.texi (Imenu): Move "@cindex tags" from here...
+	* maintaining.texi (Tags): ...to here.
+
+2008-01-23  Kevin Ryde  <[email protected]>
+
+	* custom.texi (Mouse Buttons): Update elisp xref to "Click Events" on
+	click count.
+
 2008-01-21  Juanma Barranquero  <[email protected]>
 
 	* entering.texi (Exiting): Fix typo.
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 7836e8b7c3..6660b5e66f 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1885,7 +1885,7 @@ twice.
 types; clicks beyond the third generate additional triple-click events.
 However, the full number of clicks is recorded in the event list, so
 if you know Emacs Lisp you can distinguish if you really want to
-(@pxref{Accessing Events,,, elisp, The Emacs Lisp Reference Manual}).
+(@pxref{Click Events,,, elisp, The Emacs Lisp Reference Manual}).
 We don't recommend distinct meanings for more than three clicks, but
 sometimes it is useful for subsequent clicks to cycle through the same
 set of three meanings, so that four clicks are equivalent to one
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index c82c4fd6f2..7106a380d0 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -130,7 +130,7 @@ Of course, you should substitute the proper years and copyright holder.
 
 @node Tags
 @section Tags Tables
-@cindex tags table
+@cindex tag tables
 
   A @dfn{tags table} is a description of how a multi-file program is
 broken up into files.  It lists the names of the component files and the
@@ -796,9 +796,10 @@ default is to use the same setting as the value of
   It is possible to get through all the files in the tags table with a
 single invocation of @kbd{M-x tags-query-replace}.  But often it is
 useful to exit temporarily, which you can do with any input event that
-has no special query replace meaning.  You can resume the query replace
-subsequently by typing @kbd{M-,}; this command resumes the last tags
-search or replace command that you did.
+has no special query replace meaning.  You can resume the query
+replace subsequently by typing @kbd{M-,}; this command resumes the
+last tags search or replace command that you did.  For instance, to
+skip the rest of the current file, you can type @kbd{M-> M-,}.
 
   The commands in this section carry out much broader searches than the
 @code{find-tag} family.  The @code{find-tag} commands search only for
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index b1c196ba07..9c12199b00 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -279,7 +279,6 @@ bindings for that purpose.
 @subsection Imenu
 @cindex index of buffer definitions
 @cindex buffer definitions index
-@cindex tags
 
   The Imenu facility offers a way to find the major definitions in
 a file by name.  It is also useful in text formatter major modes,