(perl-font-lock-syntactic-keywords): Don't match "sub { (...) ... }".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e94db35386cdd7d42fb2cc42dd41d5b34712148d..f54280e5651ab2b492ac040f7872d74f899cd402 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 809ed7a9f36b20b3474a4cdfc3c9b5893bd6eb86..ee14100f56d7f9e3de7622d3b9a0f676e6ac0dec 100644 (file)
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -266,7 +266,9 @@ The expansion is entirely correct because it uses the C preprocessor."
     ;; 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)