Skip to content
This repository
Browse code

Merge commit '9c171ef80cdcb3ce2664f5efbd516fbdd7d06562' into mx-perl6…

…-merge

Conflicts:
	cperl-mode.el
  • Loading branch information...
commit 41ffd8be2d9283ec91c8c212178b1c28c08764b9 2 parents 77ef150 + 9c171ef
Steffen Schwigon authored May 14, 2010

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  cperl-mode.el
4  cperl-mode.el
@@ -3436,7 +3436,7 @@ or as help on variables `cperl-tips', `cperl-problems',
3436 3436
 	(concat "[ \t]*\\(\\(?:sub\\|method\\)"
3437 3437
 		(cperl-after-sub-regexp 'named 'attr-groups)
3438 3438
 		"\\|"			; per toke.c
3439  
-		"\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)"
  3439
+		"\\(BEGIN\\|UNITCHECK\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)"
3440 3440
 		"\\)"
3441 3441
 		cperl-maybe-white-and-comment-rex))
3442 3442
   (make-local-variable 'comment-indent-function)
@@ -7614,7 +7614,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
7614 7614
 	    ;; This highlights declarations and definitions differenty.
7615 7615
 	    ;; We do not try to highlight in the case of attributes:
7616 7616
 	    ;; it is already done by `cperl-find-pods-heres'
7617  
-	    (list (concat "\\<\\(?:\\(?:multi\\|proto\\)[ \t]*\\)?\\(?:coro\\|sub\\|method\\|submethod\\)?" ; perl6: multi|proto sub methods
  7617
+	    (list (concat "\\<\\(?:\\(?:multi\\|proto\\)[ \t]*\\)?\\(?:coro\\|sub\\|method\\|submethod\\)" ; perl6: multi|proto sub methods
7618 7618
 			  cperl-white-and-comment-rex ; whitespace/comments
7619 7619
 			  "\\([^ \n\t{;()]+\\)" ; 2=name (assume non-anonymous)
7620 7620
 			  "\\("

0 notes on commit 41ffd8b

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