(what-page): Make sure we don't inf-loop if

page-delimiter matches the empty string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a63754b137d5ba613dcaeb4067bf2ff20f467fe..37e4facd8a3021aad547aaf5370fa7766cc00583 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/page.el (what-page): Make sure we don't inf-loop if
+       page-delimiter matches the empty string.
+
 2009-09-16  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/bytecomp.el (byte-compile-not-obsolete-vars): Rename from

diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 79976459ff650f873d20e3e06c7ccf5c80e323d4..7f52cf56ff8bf336c2999acb685c03821f6dbd48 100644 (file)
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -153,6 +153,8 @@ thus showing a page other than the one point was originally in."
            (opoint (point)))
        (goto-char (point-min))
        (while (re-search-forward page-delimiter opoint t)
+          (if (= (match-beginning 0) (match-end 0))
+              (forward-char 1))
          (setq count (1+ count)))
        (message "Page %d, line %d"
                 count