# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1196450493 0
# Node ID 4ad6fcfba45b047b3f973d5128fd7e83d8c18138
# Parent  793a7a37a103f28a636e9a739516568e74b983c2
(perl-font-lock-syntactic-keywords): Don't match "sub { (...) ... }".

diff -r 793a7a37a103 -r 4ad6fcfba45b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 30 16:09:01 2007 +0000
+++ b/lisp/ChangeLog	Fri Nov 30 19:21:33 2007 +0000
@@ -1,3 +1,8 @@
+2007-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
+	Don't match "sub { (...) ... }".
+
 2007-11-29  Richard Stallman  <rms@gnu.org>
 
 	* international/mule-cmds.el (toggle-input-method-active): New var.
@@ -45,8 +50,8 @@
 
 2007-11-16  Eli Zaretskii  <eliz@gnu.org>
 
-	* international/mule-cmds.el (set-locale-environment): Set
-	default-file-name-coding-system _after_ keyboard and terminal
+	* international/mule-cmds.el (set-locale-environment):
+	Set default-file-name-coding-system _after_ keyboard and terminal
 	coding systems.  This fixes last change.
 
 	* mail/rmail.el (rmail-current-subject-regexp): Allow more than
diff -r 793a7a37a103 -r 4ad6fcfba45b lisp/progmodes/perl-mode.el
--- a/lisp/progmodes/perl-mode.el	Fri Nov 30 16:09:01 2007 +0000
+++ b/lisp/progmodes/perl-mode.el	Fri Nov 30 19:21:33 2007 +0000
@@ -266,7 +266,9 @@
     ;; format statements
     ("^[ \t]*format.*=[ \t]*\\(\n\\)" (1 '(7)))
     ;; Funny things in sub arg specifications like `sub myfunc ($$)'
-    ("\\<sub\\s-+\\S-+\\s-*(\\([^)]+\\))" 1 '(1))
+    ;; Be careful not to match "sub { (...) ... }".
+    ("\\<sub[[:space:]]+[^{}[:punct:][:space:]]+[[:space:]]*(\\([^)]+\\))"
+     1 '(1))
     ;; Regexp and funny quotes.
     ("\\(?:[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)"
      (2 (if (and (match-end 1)