summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2009-09-16 13:15:10 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2009-09-16 13:15:10 +0000
commit8f38189e4f1856e006611cc8c83fd88fc788e86d (patch)
tree9c535b395e99b64f22167b56b8c036c624aa142e
parent77564fa48cbd34439311e72e2fba903fb7aa31fd (diff)
downloademacs-8f38189e4f1856e006611cc8c83fd88fc788e86d.tar.gz
(what-page): Make sure we don't inf-loop if
page-delimiter matches the empty string.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/textmodes/page.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a63754b137..37e4facd8a3 100644
--- 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 79976459ff6..7f52cf56ff8 100644
--- 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