Merge from emacs-23

[gnu-emacs] / doc / emacs / basic.texi

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index a4751e7f99dbf8a3d8eac3c99c0e57ccac554476..35c41a010971adeb113f9c13c8d46e88cb3de326 100644 (file)
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -537,6 +537,8 @@ Toggle automatic display of the current line number or column number.
 Display the number of lines in the current region.  Normally bound to
 @kbd{M-=}, except in a few specialist modes.  @xref{Mark}, for
 information about the region.
+@item M-x count-words-region
+Display the number of words in the current region.
 @item C-x =
 Display the character code of character after point, character position of
 point, and column of point (@code{what-cursor-position}).
@@ -743,6 +745,3 @@ additional times, to delete a total of 80 characters, by typing @kbd{C-x
 z z z}.  The first @kbd{C-x z} repeats the command once, and each
 subsequent @kbd{z} repeats it once again.
 
-@ignore
-   arch-tag: cda8952a-c439-41c1-aecf-4bc0d6482956
-@end ignore