# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343809722 -25200
# Node ID e0726df9196ff4c1f41d765f9cc5457ef9fbee3e
# Parent  0bccac92b6f17860d8ce8b58951e325cbf90efd4# Parent  0aabb2b34ef66e492cc0d2e9ae057ec394d6aa7a
Merge branch 'master' into rhel5

diff -r 0bccac92b6f1 -r e0726df9196f bin/ren
--- a/bin/ren	Thu Jul 26 12:44:42 2012 +0200
+++ b/bin/ren	Wed Aug 01 15:28:42 2012 +0700
@@ -30,6 +30,7 @@
   $newname =~ s/ A\+Channel / A Channel - Special /;
   $newname =~ s/ Arcana✴Famiglia / Arcana Famiglia /i;
   $newname =~ s/ Yuru Yuri♪♪ / Yuru Yuri S2 /i;
+  $newname =~ s/ Dog Days' / Dog Days S2 /i;
   $newname =~ s/\[commie\]/[Commie]/i;
   $newname =~ s/Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne!! - (\d+) \[Uncut\]/Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne!! - $1 /;
   $newname =~ s/^(Ayashi no Ceres|Chikyuu Shoujo Arjuna|Futari wa Precure  Splash Star) - (\d+)\[\d+\] - .*(\[DVD\])(\[[^]]+\])(\[[a-f0-9]{8}\]\.[^.]+)$/$4 $1 - $2 $3$5/i;
diff -r 0bccac92b6f1 -r e0726df9196f rc/vim-syntax-scss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rc/vim-syntax-scss	Wed Aug 01 15:28:42 2012 +0700
@@ -0,0 +1,101 @@
+" Vim syntax file
+" Language: SCSS (Sassy CSS)
+" Author: Daniel Hofstetter (daniel.hofstetter@42dh.com)
+" Inspired by the syntax files for sass and css. Thanks to the authors of
+" those files!
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/css.vim
+
+syn case ignore
+
+syn region scssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,scssDefinition,scssComment,scssIdChar,scssClassChar,scssAmpersand,scssVariable,scssInclude,scssExtend,scssDebug,scssWarn,@scssControl,scssInterpolation,scssNestedSelector,scssReturn
+
+syn region scssInterpolation start="#{" end="}" contains=scssVariable
+
+syn match scssVariable "$[[:alnum:]_-]\+" nextgroup=scssVariableAssignment
+syn match scssVariableAssignment ":" contained nextgroup=scssVariableValue
+syn match scssVariableValue ".*;"me=e-1 contained contains=scssVariable,scssOperator,scssDefault "me=e-1 means that the last char of the pattern is not highlighted
+syn match scssMixin "^@mixin" nextgroup=scssMixinName
+syn match scssMixinName " [[:alnum:]_-]\+" contained nextgroup=scssDefinition
+syn match scssFunction "^@function" nextgroup=scssFunctionName
+syn match scssFunctionName " [[:alnum:]_-]\+" contained nextgroup=scssDefinition
+syn match scssReturn "@return" contained
+syn match scssInclude "@include" nextgroup=scssMixinName
+syn match scssExtend "@extend .*[;}]"me=e-1 contains=cssTagName,scssIdChar,scssClassChar
+
+syn match scssColor "#[0-9A-Fa-f]\{3\}\>" contained
+syn match scssColor "#[0-9A-Fa-f]\{6\}\>" contained
+
+syn match scssIdChar "#[[:alnum:]_-]\@=" nextgroup=scssId contains=scssColor
+syn match scssId "[[:alnum:]_-]\+" contained
+syn match scssClassChar "\.[[:alnum:]_-]\@=" nextgroup=scssClass
+syn match scssClass "[[:alnum:]_-]\+" contained
+syn match scssAmpersand "&" nextgroup=cssPseudoClass
+
+syn match scssOperator "+" contained
+syn match scssOperator "-" contained
+syn match scssOperator "/" contained
+syn match scssOperator "*" contained
+
+syn match scssNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,scssIdChar,scssClassChar,scssAmpersand,scssVariable,scssMixin,scssFunction,@scssControl,scssInterpolation,scssNestedProperty
+syn match scssNestedProperty "[[:alnum:]]\+:"me=e-1 contained
+
+syn match scssDebug "@debug"
+syn match scssWarn "@warn"
+syn match scssDefault "!default" contained
+
+syn match scssIf "@if"
+syn match scssElse "@else"
+syn match scssElseIf "@else if"
+syn match scssWhile "@while"
+syn match scssFor "@for" nextgroup=scssVariable
+syn match scssFrom " from "
+syn match scssTo " to "
+syn match scssThrough " through "
+syn match scssEach "@each" nextgroup=scssVariable
+syn match scssIn " in "
+syn cluster scssControl contains=scssIf,scssElse,scssElseIf,scssWhile,scssFor,scssFrom,scssTo,scssThrough,scssEach,scssIn
+
+syn match scssComment "//.*$" contains=@Spell
+syn region scssImportStr start="\"" end="\""
+syn region scssImport start="@import" end=";" contains=scssImportStr,scssComment,cssComment,cssUnicodeEscape,cssMediaType
+
+hi def link scssVariable  Identifier
+hi def link scssVariableValue Constant
+hi def link scssMixin     PreProc
+hi def link scssMixinName Function
+hi def link scssFunction  PreProc
+hi def link scssFunctionName Function
+hi def link scssReturn    Statement
+hi def link scssInclude   PreProc
+hi def link scssExtend    PreProc
+hi def link scssComment   Comment
+hi def link scssColor     Constant
+hi def link scssIdChar    Special
+hi def link scssClassChar Special
+hi def link scssId        Identifier
+hi def link scssClass     Identifier
+hi def link scssAmpersand Character
+hi def link scssNestedProperty Type
+hi def link scssDebug     Debug
+hi def link scssWarn      Debug
+hi def link scssDefault   Special
+hi def link scssIf        Conditional
+hi def link scssElse      Conditional
+hi def link scssElseIf    Conditional
+hi def link scssWhile     Repeat
+hi def link scssFor       Repeat
+hi def link scssFrom      Repeat
+hi def link scssTo        Repeat
+hi def link scssThrough   Repeat
+hi def link scssEach      Repeat
+hi def link scssIn        Repeat
+hi def link scssInterpolation Delimiter
+hi def link scssImport    Include
+hi def link scssImportStr Include
+
+let b:current_syntax = "scss"
diff -r 0bccac92b6f1 -r e0726df9196f rc/vimrc
--- a/rc/vimrc	Thu Jul 26 12:44:42 2012 +0200
+++ b/rc/vimrc	Wed Aug 01 15:28:42 2012 +0700
@@ -44,4 +44,5 @@
   autocmd BufRead,BufNewFile .gitconfig :set noet ts=8 nolist
   autocmd BufRead,BufNewFile .git/config :set noet ts=8 nolist
   autocmd BufRead,BufNewFile *.erb :set ft=eruby ts=2 et list
+  autocmd BufRead,BufNewFile *.scss :set ft=scss
 endif
diff -r 0bccac92b6f1 -r e0726df9196f setup
--- a/setup	Thu Jul 26 12:44:42 2012 +0200
+++ b/setup	Wed Aug 01 15:28:42 2012 +0700
@@ -112,6 +112,7 @@
     _rc "${1}" "hgrc" ".hgrc"
     _rc "${1}" "vimrc" ".vimrc"
     _rc "${1}" "vim-solarized" ".vim/colors/solarized.vim"
+    _rc "${1}" "vim-syntax-scss" ".vim/syntax/scss.vim"
     _rc "${1}" "inputrc" ".inputrc"
     _rc "${1}" "../bin" ".ecos_bin"
   ;;