[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108070: * lisp/progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end

[Stefan Monnier]

------------------------------------------------------------
revno: 108070
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11966
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-07-18 05:33:09 -0400
message:
  * lisp/progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
  of narrowed buffer.
modified:
  lisp/ChangeLog
  lisp/progmodes/cperl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-09 13:54:50 +0000
+++ b/lisp/ChangeLog    2012-07-18 09:33:09 +0000
@@ -1,3 +1,8 @@
+2012-07-18  Stefan Monnier  <address@hidden>
+
+       * progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
+       of narrowed buffer (bug#11966).
+
 2012-07-09  Stefan Monnier  <address@hidden>
 
        * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-06-21 16:49:21 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-07-18 09:33:09 +0000
@@ -3498,7 +3498,8 @@
     (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)