Permalink
Browse files

Merge commit '9c171ef80cdcb3ce2664f5efbd516fbdd7d06562' into mx-perl6…

…-merge

Conflicts:
	cperl-mode.el
  • Loading branch information...
renormalist committed May 14, 2010
2 parents 77ef150 + 9c171ef commit 41ffd8be2d9283ec91c8c212178b1c28c08764b9
Showing with 2 additions and 2 deletions.
  1. +2 −2 cperl-mode.el
View
@@ -3436,7 +3436,7 @@ or as help on variables `cperl-tips', `cperl-problems',
(concat "[ \t]*\\(\\(?:sub\\|method\\)"
(cperl-after-sub-regexp 'named 'attr-groups)
"\\|" ; per toke.c
- "\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)"
+ "\\(BEGIN\\|UNITCHECK\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)"
"\\)"
cperl-maybe-white-and-comment-rex))
(make-local-variable 'comment-indent-function)
@@ -7614,7 +7614,7 @@ indentation and initial hashes. Behaves usually outside of comment."
;; This highlights declarations and definitions differenty.
;; We do not try to highlight in the case of attributes:
;; it is already done by `cperl-find-pods-heres'
- (list (concat "\\<\\(?:\\(?:multi\\|proto\\)[ \t]*\\)?\\(?:coro\\|sub\\|method\\|submethod\\)?" ; perl6: multi|proto sub methods
+ (list (concat "\\<\\(?:\\(?:multi\\|proto\\)[ \t]*\\)?\\(?:coro\\|sub\\|method\\|submethod\\)" ; perl6: multi|proto sub methods
cperl-white-and-comment-rex ; whitespace/comments
"\\([^ \n\t{;()]+\\)" ; 2=name (assume non-anonymous)
"\\("

0 comments on commit 41ffd8b

Please sign in to comment.