* simple.el (count-words): Report on narrowing.

Fixes: debbugs:9959

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42e8e9a84fc85faa8618d0f07ce935ccfd0ba2ff..794de32b69b8a8d3772586fd0fcc7b7b36f56b5d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-18  Chong Yidong  <cyd@gnu.org>
 
+       * simple.el (count-words): Report on narrowing (Bug#9959).
+
        * bindings.el: Bind M-= to count-words.
 
        * faces.el (face-spec-reset-face): Handle reverse video (Bug#4238).

diff --git a/lisp/simple.el b/lisp/simple.el
index c958c460f9801c8e26097fc2f3120a62427fbda7..3240ede0299b72ec3593108ba240bdccf1042ccc 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -986,7 +986,11 @@ END, without printing any message."
        ((use-region-p)
         (call-interactively 'count-words-region))
        (t
-        (count-words--message "Buffer" (point-min) (point-max)))))
+        (count-words--message
+         (if (= (point-max) (1+ (buffer-size)))
+             "Buffer"
+           "Narrowed part of buffer")
+         (point-min) (point-max)))))
 
 (defun count-words--message (str start end)
   (let ((lines (count-lines start end))