2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89dc0c3a3df..c899dad69a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
+        Fix regexp for when "s///" is at the beginning of line.
+
 2005-09-07  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-poly.el (math-expand-term): Multiply out any powers
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 7991f1fd1b4..e1af8b0f007 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -267,12 +267,12 @@ The expansion is entirely correct because it uses the C preprocessor."
     ("\\<sub\\s-+\\S-+\\s-*(\\([^)]+\\))" 1 '(1))
     ;; regexp and funny quotes
     ("[?:.,;=!~({[][ \t\n]*\\(/\\)" (1 '(7)))
-    ("[?:.,;=!~({[ \t\n]\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
+    ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
      ;; Nasty cases:
      ;; /foo/m  $a->m  $#m $m @m %m
      ;; \s (appears often in regexps).
      ;; -s file
-     (2 (if (assoc (char-after (match-beginning 2))
+     (3 (if (assoc (char-after (match-beginning 3))
                    perl-quote-like-pairs)
             '(15) '(7))))
     ;; TODO: here-documents ("<<\\(\\sw\\|['\"]\\)")