Skip to content
Browse files

Merge commit '73b6acd9ef605380ca89ee4a7d2e7521e340b666' into mxd-perl…

…6-merge

Conflicts:
	cperl-mode.el
  • Loading branch information...
2 parents 5de60e2 + 73b6acd commit a68b3e582efba027a56bad4b8102f47cc1dda175 @renormalist renormalist committed May 23, 2010
Showing with 3 additions and 1 deletion.
  1. +3 −1 cperl-mode.el
View
4 cperl-mode.el
@@ -7733,8 +7733,10 @@ indentation and initial hashes. Behaves usually outside of comment."
;; XXX: i think this is redundant for the sub-alikes, but
;; it will fix a corner case where the prototype has
;; nested parens in it.
- '("\\<\\(package\\|class\\|module\\|role\\|grammar\\|rule\\|token\\|regex\\|require\\|use\\|import\\|no\\|bootstrap\\|with\\|extends\\|\\(?:\\(?:multi\\|proto\\) \\)?method\\|before\\|after\\|around\\|override\\|augment\\)[ \t]+\\(?:#.+\n\\|[ \t]*\n\\)?[ \t]*\\([a-zA-z_][a-zA-z_0-9:]*\\)\\([ \t;]\\|$\\)" ; require A if B;
+ '("\\<\\(package\\|class\\|module\\|role\\|grammar\\|rule\\|token\\|regex\\|require\\|use\\|import\\|no\\|bootstrap\\|\\(?:\\(?:multi\\|proto\\) \\)?method\\|before\\|after\\|around\\|override\\|augment\\)[ \t]+\\(?:#.+\n\\|[ \t]*\n\\)?[ \t]*\\([a-zA-z_][a-zA-z_0-9:]*\\)\\([ \t;]\\|$\\)" ; require A if B;
2 font-lock-function-name-face)
+ '("\\<\\(?:with\\|extends\\)[ \t](?\\(?:\\([a-zA-z_][a-zA-z_0-9:]*\\) ?,? ?\\)+)?"
+ 1 font-lock-function-name-face)
'("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$"
1 font-lock-function-name-face)
(cond ((featurep 'font-lock-extra)

0 comments on commit a68b3e5

Please sign in to comment.
Something went wrong with that request. Please try again.