[Emacs-diffs] /srv/bzr/emacs/trunk r102966: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-special-constructs):

[Stefan Monnier]

------------------------------------------------------------
revno: 102966
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-24 15:10:04 -0500
message:
  * lisp/progmodes/perl-mode.el (perl-syntax-propertize-special-constructs):
  Don't move backward, so as not to fall in an inf-loop.
modified:
  lisp/ChangeLog
  lisp/progmodes/perl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-24 19:47:46 +0000
+++ b/lisp/ChangeLog    2011-01-24 20:10:04 +0000
@@ -1,5 +1,8 @@
 2011-01-24  Stefan Monnier  <address@hidden>
 
+       * progmodes/perl-mode.el (perl-syntax-propertize-special-constructs):
+       Don't move backward, so as not to fall in an inf-loop (bug#7736).
+
        * progmodes/ruby-mode.el (ruby-syntax-propertize-function): (bug#7735)
        Handle ?" and friends differently (e.g. don't use backrefs).
 

=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el       2011-01-14 17:18:41 +0000
+++ b/lisp/progmodes/perl-mode.el       2011-01-24 20:10:04 +0000
@@ -360,7 +360,8 @@
      (t
       ;; This is regexp like quote thingy.
       (setq char (char-after (nth 8 state)))
-      (let ((twoargs (save-excursion
+      (let ((startpos (point))
+            (twoargs (save-excursion
                        (goto-char (nth 8 state))
                        (skip-syntax-backward " ")
                        (skip-syntax-backward "w")
@@ -384,7 +385,8 @@
                          (goto-char (1+ (nth 8 state)))
                          (up-list 1)
                          t)
-                     (scan-error nil))
+                      ;; In case of error, make sure we don't move backward.
+                     (scan-error (goto-char startpos) nil))
                  (not (or (nth 8 (parse-partial-sexp
                                   (point) limit nil nil state 'syntax-table))
                           ;; If we have a self-paired opener and a twoargs