2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2ed50e4b6f..c89bb3f281a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10  Stephen Berman <stephen.berman@gmx.net>
+
+        * textmodes/page.el (what-page): Use line-number-at-pos to
+        calculate line number (Bug#6825).
+
 2011-04-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * mouse.el (mouse-drag-mode-line-1): Make sure that if we push
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index d71e20030ff..a758a9ba998 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -156,9 +156,9 @@ thus showing a page other than the one point was originally in."
           (if (= (match-beginning 0) (match-end 0))
               (forward-char 1))
           (setq count (1+ count)))
-        (message "Page %d, line %d"
-                 count
-                 (1+ (count-lines (point) opoint)))))))
+        (message "Page %d, line %d" count (line-number-at-pos opoint))))))
+
+
 
 ;;; Place `provide' at end of file.
 (provide 'page)