[Emacs-diffs] /srv/bzr/emacs/trunk r107508: * doc/lispref/positions.texi (Text Lines): Document count-words.

[Chong Yidong]

------------------------------------------------------------
revno: 107508
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-05 14:12:17 +0800
message:
  * doc/lispref/positions.texi (Text Lines): Document count-words.
modified:
  admin/FOR-RELEASE
  doc/lispref/ChangeLog
  doc/lispref/positions.texi

=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2012-03-04 06:50:18 +0000
+++ b/admin/FOR-RELEASE 2012-03-05 06:12:17 +0000
@@ -219,7 +219,7 @@
 objects.texi      cyd
 os.texi           
 package.texi
-positions.texi    
+positions.texi    cyd
 processes.texi
 searching.texi    
 sequences.texi    cyd

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-03-04 06:50:18 +0000
+++ b/doc/lispref/ChangeLog     2012-03-05 06:12:17 +0000
@@ -1,3 +1,7 @@
+2012-03-05  Chong Yidong  <address@hidden>
+
+       * positions.texi (Text Lines): Document count-words.
+
 2012-03-04  Chong Yidong  <address@hidden>
 
        * frames.texi (Frames): Remove little-used "terminal frame" and

=== modified file 'doc/lispref/positions.texi'
--- a/doc/lispref/positions.texi        2012-01-19 07:21:25 +0000
+++ b/doc/lispref/positions.texi        2012-03-05 06:12:17 +0000
@@ -372,19 +372,18 @@
 1, even if @var{start} and @var{end} are on the same line.  This is
 because the text between them, considered in isolation, must contain at
 least one line unless it is empty.
-
-Here is an example of using @code{count-lines}:
-
address@hidden
address@hidden
-(defun current-line ()
-  "Return the vertical position of address@hidden"
-  (+ (count-lines (window-start) (point))
-     (if (= (current-column) 0) 1 0)))
address@hidden group
address@hidden example
 @end defun
 
address@hidden Command count-words start end
address@hidden words in region
+This function returns the number of words between the positions
address@hidden and @var{end} in the current buffer.
+
+This function can also be called interactively.  In that case, it
+prints a message reporting the number of lines, words, and characters
+in the buffer, or in the region if the region is active.
address@hidden deffn
+
 @defun line-number-at-pos &optional pos
 @cindex line number
 This function returns the line number in the current buffer