Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org

[gnu-emacs] / lisp / progmodes / cperl-mode.el

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index f04994249527a4951a852676b3d7e0625eae4cda..d9b50ea3cc35182a1a868ef6cac026d0a72eb3a5 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3497,7 +3497,8 @@ Works before syntax recognition is done."
     (if end
        ;; Do the same for end, going small steps
        (save-excursion
-         (while (and end (get-text-property end 'syntax-type))
+         (while (and end (< end (point-max))
+                     (get-text-property end 'syntax-type))
            (setq pos end
                  end (next-single-property-change end 'syntax-type nil (point-max)))
            (if end (progn (goto-char end)