From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 18 Jul 2012 09:33:09 +0000 (-0400)
Subject: * lisp/progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
X-Git-Tag: emacs-24.2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95bdccb782fbeb97cc2cc12a64635d6d5f85475f;p=emacs.git

* lisp/progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
of narrowed buffer.

Fixes: debbugs:11966
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1faebf5b083..1534eb2725d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
+	of narrowed buffer (bug#11966).
+
 2012-07-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/sh-script.el (sh-syntax-propertize-function): Fix last
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 2c258fb446a..58cbf26496d 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3498,7 +3498,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)