[from now] 2013/03/30 13:33:05

diff --git a/.vrapperrc b/.vrapperrc
index cd458b6..8660748 100755
--- a/.vrapperrc
+++ b/.vrapperrc
@@ -20,8 +20,8 @@ set hlsearch
 " 表示設定
 "----------------------------------------
 "エラー時の音とビジュアルベルの抑制(gvimは.gvimrcで設定)
-set noerrorbells
-set novisualbell
+"set noerrorbells
+"set novisualbell

 "----------------------------------------
 " ノーマルモード
diff --git a/vim/.gvimrc b/vim/.gvimrc
index 600857a..36eedf1 100755
--- a/vim/.gvimrc
+++ b/vim/.gvimrc
@@ -63,7 +63,7 @@ elseif has('gui_macvim')
     "set gfn=しねきゃぷしょん:h12
     "set gfn=あんずもじ等幅:h12
     "set gfn=Osaka-Mono:h11
- 	set gfn=Ricty\ Regular\ for\ Powerline:h12
+ 	set gfn=Ricty\ Regular\ for\ Powerline:h10
     "set gfn=S2G-Uni-font:h12
     "set gfn=S2G-Luna-font:h13
     "set gfn=HuiFont:h12
diff --git a/vim/.vim/.vimpos b/vim/.vim/.vimpos
index 596a911..fac3257 100755
--- a/vim/.vim/.vimpos
+++ b/vim/.vim/.vimpos
@@ -1,2 +1,2 @@
 winpos  4  22
-set lines=58 columns=224
+set lines=76 columns=269
diff --git a/vim/.vimrc b/vim/.vimrc
index 8e2bc63..4c3560c 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -99,8 +99,8 @@ NeoBundleLazy 'svn.vim'
 NeoBundleLazy 'tacroe/unite-mark.git'
 NeoBundleLazy 'teramako/jscomplete-vim.git'
 NeoBundleLazy 'thinca/vim-openbuf.git'
-NeoBundleLazy 'thinca/vim-ref.git', {
-            \ 'autoload': { 'commands': ['Unite'] }
+NeoBundle 'thinca/vim-ref.git', {
+            \ 'autoload': { 'commands': ['Unite', 'Ref'] }
             \ }
 NeoBundleLazy 'tsukkee/unite-tag.git'
 NeoBundleLazy 'tyru/vim-altercmd.git'
@@ -118,6 +118,9 @@ NeoBundle 'goldfeld/vim-seek' " Seek makes navigating long lines effortless, act
 NeoBundleLazy 'davidhalter/jedi-vim.git', {
             \ 'autoload': { 'filetypes': 'python' }
             \ }
+NeoBundleLazy 'mitechie/pyflakes-pathogen', {
+            \ 'autoload': { 'filetypes': 'python' }
+            \ }
 NeoBundleLazy 'leafgarland/typescript-vim', {
             \ 'autoload': { 'filetypes': 'typescript' }
             \ }
@@ -805,6 +808,7 @@ augroup Template
     autocmd BufNewFile *.hta 0r $MY_VIMRUNTIME/template/skeleton.hta
     autocmd BufNewFile *.ts 0r $MY_VIMRUNTIME/template/skeleton.ts
     autocmd BufNewFile *.sup 0r $MY_VIMRUNTIME/template/skeleton.sup
+    autocmd BufNewFile *.py 0r $MY_VIMRUNTIME/template/skeleton.py
 augroup END
 "===================================================================================}}}

@@ -1238,6 +1242,7 @@ nnoremap [Space]gb :<C-u>Gblame<Enter>
 " }}}

 "" vim-quickrun {{{
+"nmap [Space]r <Plug>(quickrun)
 " quickrunの最終的なコマンドを出力する {{{
 " http://d.hatena.ne.jp/osyo-manga/searchdiary?word=quickrun
 let s:hook = {
@@ -1375,7 +1380,7 @@ let g:quickrun_config = {
             \       "hook/echo/output_success": "success!!!",
             \       "hook/echo/output_failure": "failure...",
             \       "outputter": "multi:buffer:quickfix",
-            \       "outputter/buffer/split": ":botright 8sp",
+            \       "outputter/buffer/split": ":botright 18sp",
             \       "runner": "vimproc",
             \       "runner/vimproc/updatetime": 40,
             \   },
@@ -1404,6 +1409,29 @@ let g:quickrun_config = {
     "autocmd FileType 2ch_boardlist,2ch_threadlist,2ch_thread setl encoding=japan fileencodings=cp932
 "augroup END

+"" jedi-vim
+let g:jedi#auto_initialization = 1
+let g:jedi#rename_command = "<leader>R"
+"let g:jedi#popup_on_dot = 1
+"let g:jedi#auto_vim_configuration = 0
+"let g:jedi#show_function_definition = 0
+autocmd FileType python let b:did_ftplugin = 1
+
+"" vim-ref
+function! UniteRefDoc()
+    if &filetype =~ 'perl'
+        Unite ref/perldoc
+    elseif &filetype =~ 'python'
+        Unite -start-insert ref/pydoc
+    elseif &filetype =~ 'ruby'
+        Unite ref/refe
+    else
+        Unite ref/man
+    endif
+endfunction
+
+nnoremap [Space]r :<C-u>call UniteRefDoc()<CR>
+
 "===================================================================================}}}

 "{{{ ========== Language Settings =====================================================
@@ -1412,6 +1440,7 @@ let g:quickrun_config = {
 autocmd FileType python setl autoindent
 autocmd FileType python setl smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
 autocmd FileType python setl tabstop=8 expandtab shiftwidth=4 softtabstop=4
+autocmd FileType python setl foldmethod=indent foldlevel=99
 " coffeescript
 augroup coffeescript-auto-compile
     autocmd!
diff --git a/vimperator/.vimperatorrc b/vimperator/.vimperatorrc
index 6944978..89fa08b 100755
--- a/vimperator/.vimperatorrc
+++ b/vimperator/.vimperatorrc
@@ -340,7 +340,7 @@ liberator.globalVariables.plugin_loader_plugins = <>
    //maine_coon
    //menu-mode-sucks
    migemized_find
-   nextlink
+   //nextlink
    opener-ex
    //pluginManager
    stella
diff --git a/zsh/.zshenv b/zsh/.zshenv
index c7509ec..fddaa57 100755
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -158,13 +158,13 @@ fi
 # pythonz
 if [ -s $HOME/.pythonz/etc/bashrc ]; then
     source $HOME/.pythonz/etc/bashrc
-    # use python 3.2.3
-    if [ -d "$HOME/.pythonz/pythons/CPython-3.2.3/bin" ]; then
-        export PATH=$HOME/.pythonz/pythons/CPython-3.2.3/bin:$PATH
-        export VIRTUALENVWRAPPER_PYTHON=$HOME/.pythonz/pythons/CPython-3.2.3/bin/python
-        export VIRTUALENVWRAPPER_VIRTUALENV=$HOME/.pythonz/pythons/CPython-3.2.3/bin/virtualenv
+    # use python 3.3.0
+    if [ -d "$HOME/.pythonz/pythons/CPython-3.3.0/bin" ]; then
+        export PATH=$HOME/.pythonz/pythons/CPython-3.3.0/bin:$PATH
+        export VIRTUALENVWRAPPER_PYTHON=$HOME/.pythonz/pythons/CPython-3.3.0/bin/python
+        export VIRTUALENVWRAPPER_VIRTUALENV=$HOME/.pythonz/pythons/CPython-3.3.0/bin/virtualenv
         export WORKON_HOME=$HOME/.virtualenvs
-        source $HOME/.pythonz/pythons/CPython-3.2.3/bin/virtualenvwrapper.sh
+        source $HOME/.pythonz/pythons/CPython-3.3.0/bin/virtualenvwrapper.sh
     fi
 fi
[from now] 2013/03/30 13:33:49

diff --git a/vim/.vim/template/skeleton.py b/vim/.vim/template/skeleton.py
new file mode 100644
index 0000000..3a1213c
--- /dev/null
+++ b/vim/.vim/template/skeleton.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
[from now] 2013/03/30 13:34:54

diff --git a/vim/.vim/template/skeleton.py b/vim/.vim/template/skeleton.py
index 3a1213c..faa18be 100644
--- a/vim/.vim/template/skeleton.py
+++ b/vim/.vim/template/skeleton.py
@@ -1,3 +1,2 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
diff --git a/vim/.vimrc b/vim/.vimrc
index 4c3560c..c2e297f 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -85,7 +85,6 @@ NeoBundle 'mattn/gist-vim'
 NeoBundleLazy 'mattn/unite-advent_calendar.git'
 NeoBundleLazy 'mattn/vim-metarw-simplenote.git'
 NeoBundleLazy 'mattn/vim-metarw.git'
-NeoBundleLazy 'mattn/zencoding-vim.git'
 NeoBundleLazy 'motemen/hatena-vim.git'
 NeoBundleLazy 'osyo-manga/checking-global-variables.git'
 NeoBundleLazy 'osyo-manga/unite-toggle-options.git'
@@ -114,6 +113,9 @@ NeoBundleLazy 'vimwiki'
 NeoBundleLazy 'yuroyoro/yuroyoro256.vim'
 NeoBundle 'https://bitbucket.org/pentie/vimrepress'
 NeoBundle 'goldfeld/vim-seek' " Seek makes navigating long lines effortless, acting like f but taking two characters.
+NeoBundleLazy 'mattn/zencoding-vim.git', {
+            \ 'autoload' : { 'filetypes' : 'html' }
+            \ }
 "NeoBundle 'MarcWeber/vim-haxe' " vim runtime directory providing support for the haxe compiler - be more productive
 NeoBundleLazy 'davidhalter/jedi-vim.git', {
             \ 'autoload': { 'filetypes': 'python' }
@@ -1165,7 +1167,7 @@ nnoremap <silent> [Space]ub :<C-u>Unite buffer -auto-preview -no-split -buffer-n
 " ファイル一覧
 "nnoremap <silent> [Space]uf :<C-u>Unite -buffer-name=files file<CR>
 " ファイル一覧(再帰)
-nnoremap <silent> [Space]uf :<C-u>Unite -start-insert -buffer-name=file_rec -no-split file_rec<CR>
+nnoremap <silent> [Space]uf :<C-u>Unite -start-insert -buffer-name=file_rec/async -no-split file_rec/async<CR>
 " ブックマーク
 nnoremap <silent> ,ub :<C-u>Unite -buffer-name=bookmark -default-action=cd bookmark<CR>
 " grep
@@ -1181,7 +1183,7 @@ nnoremap <silent> [Space]um :<C-u>Unite file_mru -buffer-name=file_mru -auto-pre
 " 常用セット
 nnoremap <silent> [Space]uu :<C-u>Unite buffer file_mru -no-split<CR>
 " 全部乗せ
-nnoremap <silent> [Space]ua :<C-u>Unite -buffer-name=files -start-insert buffer file_mru bookmark file file_rec<CR>
+nnoremap <silent> [Space]ua :<C-u>Unite -buffer-name=files -start-insert buffer file_mru bookmark file file_rec/async<CR>
 " 検索
 nnoremap <silent> [Space]/ :<C-u>Unite -buffer-name=search line/fast -start-insert -no-split -no-quit<CR>
 " help
@@ -1456,7 +1458,7 @@ augroup END
 " 行末の余分な改行を削除
 augroup RTrim
     autocmd!
-    autocmd BufWritePre * call RTrim()
+    "autocmd BufWritePre * call RTrim()
 augroup END
 function! RTrim()
     let save_cursor = getpos(".")
diff --git a/win/CraftLaunch/clnch.ini b/win/CraftLaunch/clnch.ini
index 01c69a0..05e2bc1 100755
--- a/win/CraftLaunch/clnch.ini
+++ b/win/CraftLaunch/clnch.ini
@@ -16,48 +16,48 @@ height = 31
 restore = 0

 [COMMANDLINE]
-history_0 = diff_copy
-history_1 = thunderbird
-history_2 = TracLightning
-history_3 = JASMINE
-history_4 = Cfiler
-history_5 = esRas
-history_6 = ShutDown
-history_7 = EXCEL
-history_8 = firefox
-history_9 = sakura
-history_10 = iexplore
-history_11 = EPO
-history_12 = RestartTracLightning
-history_13 = CNES
-history_14 = KONICA_MINOLTA
-history_15 = Config
-history_16 = Command
-history_17 = FlowLites
-history_18 = TRP
-history_19 = abkf_copy
-history_20 = Toggl
-history_21 = chrome
-history_22 = f:/LaunchEDS2.exe
-history_23 = i:/Start.exe
-history_24 = g:/Start.exe
-history_25 = emptyTrash.vbs
-history_26 = Support
-history_27 = SendTo
-history_28 = test
-history_29 = Printer
-history_30 = GomiBako
-history_31 = ControlPanel
-history_32 = mstsc
-history_33 = Shu
-history_34 = AddressKun
-history_35 = WinMergeU
-history_36 = StarofficeTop
-history_37 = SOX_Configration
-history_38 = ShainMail
-history_39 =
-history_40 = Staroffice
-history_41 = rapture
+history_0 = firefox
+history_1 = ControlPanel
+history_2 = EXCEL
+history_3 = thunderbird
+history_4 = TracLightning
+history_5 = rapture
+history_6 = esRas
+history_7 = iexplore
+history_8 = JASMINE
+history_9 = Cfiler
+history_10 = ShutDown
+history_11 = diff_copy
+history_12 = sakura
+history_13 = EPO
+history_14 = RestartTracLightning
+history_15 = CNES
+history_16 = KONICA_MINOLTA
+history_17 = Config
+history_18 = Command
+history_19 = FlowLites
+history_20 = TRP
+history_21 = abkf_copy
+history_22 = Toggl
+history_23 = chrome
+history_24 = f:/LaunchEDS2.exe
+history_25 = i:/Start.exe
+history_26 = g:/Start.exe
+history_27 = emptyTrash.vbs
+history_28 = Support
+history_29 = SendTo
+history_30 = test
+history_31 = Printer
+history_32 = GomiBako
+history_33 = mstsc
+history_34 = Shu
+history_35 = AddressKun
+history_36 = WinMergeU
+history_37 = StarofficeTop
+history_38 = SOX_Configration
+history_39 = ShainMail
+history_40 =
+history_41 = Staroffice
 history_42 = AIS
 history_43 = Eesra
 history_44 = ESS