# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1332095418 -25200
# Node ID 467e26c59d712eadd157dcfc760f2eacfc4111ce
# Parent  aeb51856e281f1ea6ae22be68544f69d38b635eb# Parent  d4c74e246ccb2212cdd9b9de428f2b59e3239bad
Merge.

diff -r aeb51856e281 -r 467e26c59d71 bin/ren
--- a/bin/ren	Mon Mar 19 01:29:48 2012 +0700
+++ b/bin/ren	Mon Mar 19 01:30:18 2012 +0700
@@ -304,11 +304,11 @@
   #nothing
   $newname =~ s/(\(|\[) *(H264 704x400|640x480 DivX511 120fps mp3|640x480 DivX511 mp3|h\.264-Hi10P|720x480|10-?bit|10bit 480p H264|640x360|640x360 H264 AAC|h264\.aac|hi10p|10bit|\d+th Release|x264\.aac|xvid|divx5\.2\.1|divx5\.1|divx5\.05|divx5\.1\.1|h\.?264 AC3|848x480|H264 848x480|h264-480p AAC|h\.264-480p) *(\)|\])//i;
   #dvd
-  $newname =~ s/(\(|\[) *(DVD-480p-AAC|DVD x264 10-bit AC3|DVD 10bit) *(\)|\])/[DVD]/i;
+  $newname =~ s/(\(|\[) *(DVD Hi10P 640x480|DVD-480p-AAC|DVD x264 10-bit AC3|DVD 10bit) *(\)|\])/[DVD]/i;
   #dvd again
   $newname =~ s/(\(|\[) *(R2 DVD\.H264\.AC3|DVD H264 720x480|DVD 720x480 x264 FLAC|R1DVD 720x480 x264 AC-3|DVD 712x480 AC-3|DVD 720x480 AC-3|R\d DVD\.H264\.AC3|DVD 1024x576 x264 FLAC|DVD H264 640x480|DVD H264 720x480 AAC|DVD 704x480 H264 AC3|DVD 704x480|DVDRip\.Xvid\.864x480\.Vorbis|DVD H264 848x480|DVD 720x480|DVD H264 720x480|DVD, wmv, mp3) *(\)|\])/[DVD]/i;
   #1080p BD
-  $newname =~ s/(\(|\[) *(BDRip 1080p x264 FLAC|BD Hi10P 1920x1080|BD Hi10P 1920x1080 H264 FLAC|BD 1920x1080 x264 Hi10P FLAC|BD 1920x1080 Hi10P|1920x1080 BD AAC|BD\]\[h264-1080p FLAC|BD-h264-10bit-1080p|BD\]\[1080p-FLAC|BD 1080|1920x1080 Hi10p h264 AAC|BD 1920x1080 x264 AAC|BD 1080p Hi10P|BDRip 1080p x264 FLAC|BD-1080p-|BD-1080p-FLAC|1920x1038 Blu-Ray FLAC|1920x1080 Blu-Ray FLAC|1920x1080 h264 BD FLAC|1920x1080 BD|BD\.1080p\.FLAC|BD 1080p H\.264 AAC 5\.1|BD 1080p) *(\)|\])/[1080p BD]/i;
+  $newname =~ s/(\(|\[) *(BD\]\[10bit-1080p-AAC|BDRip 1080p x264 FLAC|BD Hi10P 1920x1080|BD Hi10P 1920x1080 H264 FLAC|BD 1920x1080 x264 Hi10P FLAC|BD 1920x1080 Hi10P|1920x1080 BD AAC|BD\]\[h264-1080p FLAC|BD-h264-10bit-1080p|BD\]\[1080p-FLAC|BD 1080|1920x1080 Hi10p h264 AAC|BD 1920x1080 x264 AAC|BD 1080p Hi10P|BDRip 1080p x264 FLAC|BD-1080p-|BD-1080p-FLAC|1920x1038 Blu-Ray FLAC|1920x1080 Blu-Ray FLAC|1920x1080 h264 BD FLAC|1920x1080 BD|BD\.1080p\.FLAC|BD 1080p H\.264 AAC 5\.1|BD 1080p) *(\)|\])/[1080p BD]/i;
   #720p
   $newname =~ s/(\(|\[) *(1280x720 Hi10p|AT-X Hi10P 1280x720|1280x720 Hi10p AAC|AT-X 1280x720 H264|Hi10P 1280x720 H264|Hi10P 1280x720|1280x720 Hi10P|1280x720 5\.1|1280x720 x264 AAC|1280x720 H264 AAC|720p H264 AAC|1280x720|1280x720 H\.?264 AAC) *(\)|\])/[720p]/i;
   #720p BD
diff -r aeb51856e281 -r 467e26c59d71 rc/tmux
--- a/rc/tmux	Mon Mar 19 01:29:48 2012 +0700
+++ b/rc/tmux	Mon Mar 19 01:30:18 2012 +0700
@@ -13,10 +13,7 @@
 set -g status-utf8 on
 setw -g utf8 on
 
-#set -g pane-border-bg black
-#set -g pane-border-fg white
-#set -g pane-active-border-bg black
-set -g pane-active-border-fg blue
+#set -g pane-active-border-fg blue
 
 set -g set-titles on
 set -g set-titles-string '[#S] #I:#W #T'
@@ -25,5 +22,4 @@
 setw -g window-status-current-attr bold
 setw -g window-status-current-bg red
 setw -g window-status-current-fg white
-setw -g window-status-current-format '#I:#W'
-
+#setw -g window-status-current-format '#I:#W'
diff -r aeb51856e281 -r 467e26c59d71 rc/vimrc
--- a/rc/vimrc	Mon Mar 19 01:29:48 2012 +0700
+++ b/rc/vimrc	Mon Mar 19 01:30:18 2012 +0700
@@ -26,6 +26,8 @@
 "autocmd VimEnter * NERDTree
 "autocmd BufEnter * NERDTreeMirror
 
-syntax on
-set background=dark
-colorscheme solarized
+if has('syntax')
+  syntax on
+  set background=dark
+  colorscheme solarized
+endif