Permalink
Browse files

Fixed what went wrong in merge commit 3316628

There I had an unfortunate confusion. I'm probably too
tired of all that merging to repeat it just to have a clean
history. So I fix it by hand and live with some broken commits.
  • Loading branch information...
1 parent aa0506d commit 0b3a31bfd96f030f49cd6e15b0a1f0f11ca428cf @renormalist renormalist committed May 17, 2010
Showing with 4 additions and 10 deletions.
  1. +4 −10 cperl-mode.el
View
14 cperl-mode.el
@@ -7505,18 +7505,12 @@ indentation and initial hashes. Behaves usually outside of comment."
'("if" "until" "while" "elsif" "else" "unless" "for"
"given" "when" "default" "break"
"foreach" "continue" "exit" "die" "last" "loop" "goto" "next"
- "redo" "return" "local" "exec" "sub" "do" "dump" "use" "our" "state"
+ "redo" "return" "local" "exec" "do" "dump" "use" "our" "state"
"require" "package" "eval" "my" "BEGIN" "END" "CHECK"
- "INIT" "START" "FIRST" "ENTER" "LEAVE" "KEEP"
+ "INIT" "START" "FIRST" "ENTER" "LEAVE" "KEEP" "UNITCHECK"
"UNDO" "NEXT" "LAST" "PRE" "POST" "CATCH" "CONTROL"
- "given" "when" "default" "has" "returns" "of" "is" "does"
- "class" "module" "role" "try")
- "foreach" "continue" "exit" "die" "last" "goto" "next"
- "redo" "return" "local" "exec"
- "do" "dump"
- "use" "our"
- "require" "package" "eval" "my" "state"
- "BEGIN" "END" "CHECK" "INIT" "UNITCHECK"))
+ "has" "returns" "of" "is" "does"
+ "class" "module" "role" "try"))
"\\|") ; Flow control
"\\)\\>") 2) ; was "\\)[ \n\t;():,\|&]"
; In what follows we use `type' style

0 comments on commit 0b3a31b

Please sign in to comment.