[Emacs-diffs] emacs/lisp ChangeLog progmodes/perl-mode.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/30 13:43:55

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : perl-mode.el 

Log message:
        (perl-font-lock-special-syntactic-constructs):
        Don't signal an error when bumping into EOB in tr, s, or y.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16766&r2=1.16767
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/perl-mode.el?cvsroot=emacs&r1=1.82&r2=1.83

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16766
retrieving revision 1.16767
diff -u -b -r1.16766 -r1.16767
--- ChangeLog   29 Nov 2009 23:55:57 -0000      1.16766
+++ ChangeLog   30 Nov 2009 13:43:51 -0000      1.16767
@@ -1,3 +1,8 @@
+2009-11-30  Stefan Monnier  <address@hidden>
+
+       * progmodes/perl-mode.el (perl-font-lock-special-syntactic-constructs):
+       Don't signal an error when bumping into EOB in tr, s, or y.
+
 2009-11-29  Juri Linkov  <address@hidden>
 
        * startup.el (fancy-about-text): Fix wording of Guided Tour.
@@ -10,8 +15,7 @@
 
        * ediff-util.el (ediff-minibuffer-with-setup-hook):
        New compatibility macro.
-       (ediff-read-file-name): Use it instead of
-       `minibuffer-with-setup-hook'.
+       (ediff-read-file-name): Use it instead of `minibuffer-with-setup-hook'.
 
 2009-11-29  Juri Linkov  <address@hidden>
 

Index: progmodes/perl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/perl-mode.el,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- progmodes/perl-mode.el      28 Jan 2009 02:17:29 -0000      1.82
+++ progmodes/perl-mode.el      30 Nov 2009 13:43:55 -0000      1.83
@@ -273,8 +273,8 @@
     ;; (or some similar separator), or by one of the special keywords
     ;; corresponding to builtin functions that can take their first arg
     ;; without parentheses.  Of course, that presume we're looking at the
-    ;; *opening* slash.  We can mis-match the closing ones, because they are
-    ;; treated separately later in
+    ;; *opening* slash.  We can afford to mis-match the closing ones
+    ;; here, because they will be re-treated separately later in
     ;; perl-font-lock-special-syntactic-constructs.
     (,(concat "\\(?:\\(?:\\(?:^\\|[^$@&%[:word:]]\\)"
               (regexp-opt '("split" "if" "unless" "until" "while" "split"
@@ -381,13 +381,14 @@
                            'font-lock-multiline t)
                           ;;
                           (unless
+                              (or (eobp)
                               (save-excursion
                                 (with-syntax-table
                                     (perl-quote-syntax-table (char-after))
                                   (forward-sexp 1))
                                 (put-text-property pos (line-end-position)
-                                                   'jit-lock-defer-multiline t)
-                                (looking-at "\\s-*\\sw*e"))
+                                                    jit-lock-defer-multiline t)
+                                    (looking-at "\\s-*\\sw*e")))
                             (put-text-property (point) (1+ (point))
                                                'syntax-table
                                                (if (assoc (char-after)