[Emacs-diffs] Changes to emacs/lisp/progmodes/perl-mode.el, v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/11/30 19:21:35

Index: progmodes/perl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/perl-mode.el,v
retrieving revision 1.69.2.3
retrieving revision 1.69.2.4
diff -u -b -r1.69.2.3 -r1.69.2.4
--- progmodes/perl-mode.el      25 Aug 2007 21:29:47 -0000      1.69.2.3
+++ progmodes/perl-mode.el      30 Nov 2007 19:21:32 -0000      1.69.2.4
@@ -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)