pull

ChantWei · Apr 3, 2013 · 632eed1 · 632eed1
2 parents 6bd72ca + 41ec9d0
commit 632eed1
Show file tree

Hide file tree

Showing 321 changed files with 17 additions and 3 deletions.
diff --git a/.netrwhist b/.netrwhist
@@ -0,0 +1,3 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_1='/home/ma6174/.vim/bundle/vundle'
diff --git a/.vim b/.vim
diff --git a/.vimrc b/.vimrc
@@ -366,7 +366,6 @@ Bundle 'gmarik/vundle'
 "
 " original repos on github
 Bundle 'tpope/vim-fugitive'
-Bundle 'Lokaltog/vim-easymotion'
 Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
 "ndle 'tpope/vim-rails.git'
 " vim-scripts repos

diff --git a/.zshrc b/.zshrc
diff --git a/README.md b/README.md
@@ -6,8 +6,11 @@
 * zsh配置文件
 
 ## 使用方法：
-1. 安装ctags：`sudo apt-get install ctags`
+1. 安装vim `sudo apt-get install vim`
+- 安装ctags：`sudo apt-get install ctags`
+- `sudo ln -s /usr/bin/ctags /usr/local/bin/ctags`
 - clone配置文件：`cd ~/ && git clone git://github.com/ma6174/vim.git`
+<<<<<<< HEAD
 - `mv ~/vim ~/.vim`
 - `mv ~/.vim/.vimrc ~/`
 - clone bundle 程序：`git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle`
@@ -16,6 +19,15 @@
 ## 2013年4月3日更新
 
 1. 完善安装方法，修复bundle问题
+=======
+- `cp ~/vim ~/.vim`
+- `cp ~/.vim/.vimrc ~/`
+
+## 2013年3月22日更新：
+
+1. 修复bundle插件问题
+-  修复ctags问题
+>>>>>>> 41ec9d0a9278c1a6dfa63e625e844a9a07584cfe
 
 ## 2013年3月17日更新：
 1. 增加go语言插件

diff --git a/after/complete-dict b/after/complete-dict
diff --git a/after/ftplugin/python_pydiction.vim b/after/ftplugin/python_pydiction.vim
diff --git a/after/plugin/snipMate.vim b/after/plugin/snipMate.vim
diff --git a/after/pydiction.py b/after/pydiction.py
diff --git a/autoload/acp.vim b/autoload/acp.vim
diff --git a/autoload/conque_term.vim b/autoload/conque_term.vim
diff --git a/autoload/conque_term/conque.py b/autoload/conque_term/conque.py
diff --git a/autoload/conque_term/conque_globals.py b/autoload/conque_term/conque_globals.py
diff --git a/autoload/conque_term/conque_screen.py b/autoload/conque_term/conque_screen.py
diff --git a/autoload/conque_term/conque_sole.py b/autoload/conque_term/conque_sole.py
diff --git a/autoload/conque_term/conque_sole_communicator.py b/autoload/conque_term/conque_sole_communicator.py
diff --git a/autoload/conque_term/conque_sole_shared_memory.py b/autoload/conque_term/conque_sole_shared_memory.py
diff --git a/autoload/conque_term/conque_sole_subprocess.py b/autoload/conque_term/conque_sole_subprocess.py
diff --git a/autoload/conque_term/conque_sole_wrapper.py b/autoload/conque_term/conque_sole_wrapper.py
diff --git a/autoload/conque_term/conque_subprocess.py b/autoload/conque_term/conque_subprocess.py
diff --git a/autoload/conque_term/conque_win32_util.py b/autoload/conque_term/conque_win32_util.py
diff --git a/autoload/go/complete.vim b/autoload/go/complete.vim
diff --git a/autoload/hammer.vim b/autoload/hammer.vim
diff --git a/autoload/mark.vim b/autoload/mark.vim
diff --git a/autoload/mark/palettes.vim b/autoload/mark/palettes.vim
diff --git a/autoload/pythoncomplete.vim b/autoload/pythoncomplete.vim
diff --git a/autoload/snipMate.vim b/autoload/snipMate.vim
diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
diff --git a/autoload/zencoding/lang.vim b/autoload/zencoding/lang.vim
diff --git a/autoload/zencoding/lang/css.vim b/autoload/zencoding/lang/css.vim
diff --git a/autoload/zencoding/lang/haml.vim b/autoload/zencoding/lang/haml.vim
diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim
diff --git a/autoload/zencoding/lang/sass.vim b/autoload/zencoding/lang/sass.vim
diff --git a/autoload/zencoding/lang/scss.vim b/autoload/zencoding/lang/scss.vim
diff --git a/autoload/zencoding/lang/slim.vim b/autoload/zencoding/lang/slim.vim
diff --git a/autoload/zencoding/util.vim b/autoload/zencoding/util.vim
diff --git a/bundle/.vundle/script-names.vim-scripts.org.json b/bundle/.vundle/script-names.vim-scripts.org.json
diff --git a/colors/README.txt b/colors/README.txt
diff --git a/colors/blue.vim b/colors/blue.vim
diff --git a/colors/darkblue.vim b/colors/darkblue.vim
diff --git a/colors/default.vim b/colors/default.vim
diff --git a/colors/delek.vim b/colors/delek.vim
diff --git a/colors/desert.vim b/colors/desert.vim
diff --git a/colors/elflord.vim b/colors/elflord.vim
diff --git a/colors/evening.vim b/colors/evening.vim
diff --git a/colors/koehler.vim b/colors/koehler.vim
diff --git a/colors/morning.vim b/colors/morning.vim
diff --git a/colors/murphy.vim b/colors/murphy.vim
diff --git a/colors/pablo.vim b/colors/pablo.vim
diff --git a/colors/peachpuff.vim b/colors/peachpuff.vim
diff --git a/colors/ron.vim b/colors/ron.vim
diff --git a/colors/shine.vim b/colors/shine.vim
diff --git a/colors/slate.vim b/colors/slate.vim
diff --git a/colors/t.vim b/colors/t.vim
diff --git a/colors/torte.vim b/colors/torte.vim
diff --git a/colors/zellner.vim b/colors/zellner.vim
diff --git a/doc/HTML.txt b/doc/HTML.txt
diff --git a/doc/NERD_tree.txt b/doc/NERD_tree.txt
diff --git a/doc/arabic.cnx b/doc/arabic.cnx
diff --git a/doc/autocmd.cnx b/doc/autocmd.cnx
diff --git a/doc/change.cnx b/doc/change.cnx
diff --git a/doc/cmdline.cnx b/doc/cmdline.cnx
diff --git a/doc/conque_term.txt b/doc/conque_term.txt
diff --git a/doc/debug.cnx b/doc/debug.cnx
diff --git a/doc/debugger.cnx b/doc/debugger.cnx
diff --git a/doc/develop.cnx b/doc/develop.cnx
diff --git a/doc/diff.cnx b/doc/diff.cnx
diff --git a/doc/digraph.cnx b/doc/digraph.cnx
diff --git a/doc/editing.cnx b/doc/editing.cnx
diff --git a/doc/eval.cnx b/doc/eval.cnx
diff --git a/doc/farsi.cnx b/doc/farsi.cnx
diff --git a/doc/filetype.cnx b/doc/filetype.cnx
diff --git a/doc/fold.cnx b/doc/fold.cnx
diff --git a/doc/ft_ada.cnx b/doc/ft_ada.cnx
diff --git a/doc/ft_sql.cnx b/doc/ft_sql.cnx
diff --git a/doc/gui.cnx b/doc/gui.cnx
diff --git a/doc/gui_w16.cnx b/doc/gui_w16.cnx
diff --git a/doc/gui_w32.cnx b/doc/gui_w32.cnx
diff --git a/doc/gui_x11.cnx b/doc/gui_x11.cnx
diff --git a/doc/hangulin.cnx b/doc/hangulin.cnx
diff --git a/doc/hebrew.cnx b/doc/hebrew.cnx
diff --git a/doc/help.cnx b/doc/help.cnx
diff --git a/doc/helphelp.cnx b/doc/helphelp.cnx
diff --git a/doc/howto.cnx b/doc/howto.cnx
diff --git a/doc/if_cscop.cnx b/doc/if_cscop.cnx
diff --git a/doc/if_lua.cnx b/doc/if_lua.cnx
diff --git a/doc/if_mzsch.cnx b/doc/if_mzsch.cnx
diff --git a/doc/if_ole.cnx b/doc/if_ole.cnx
diff --git a/doc/if_perl.cnx b/doc/if_perl.cnx
diff --git a/doc/if_pyth.cnx b/doc/if_pyth.cnx
diff --git a/doc/if_ruby.cnx b/doc/if_ruby.cnx
diff --git a/doc/if_sniff.cnx b/doc/if_sniff.cnx
diff --git a/doc/if_tcl.cnx b/doc/if_tcl.cnx
diff --git a/doc/indent.cnx b/doc/indent.cnx
diff --git a/doc/index.cnx b/doc/index.cnx
diff --git a/doc/insert.cnx b/doc/insert.cnx
diff --git a/doc/intro.cnx b/doc/intro.cnx
diff --git a/doc/map.cnx b/doc/map.cnx
diff --git a/doc/mark.txt b/doc/mark.txt
diff --git a/doc/mbyte.cnx b/doc/mbyte.cnx
diff --git a/doc/message.cnx b/doc/message.cnx
diff --git a/doc/mlang.cnx b/doc/mlang.cnx
diff --git a/doc/motion.cnx b/doc/motion.cnx
diff --git a/doc/netbeans.cnx b/doc/netbeans.cnx
diff --git a/doc/options.cnx b/doc/options.cnx
diff --git a/doc/os_390.cnx b/doc/os_390.cnx
diff --git a/doc/os_amiga.cnx b/doc/os_amiga.cnx
diff --git a/doc/os_beos.cnx b/doc/os_beos.cnx
diff --git a/doc/os_dos.cnx b/doc/os_dos.cnx
diff --git a/doc/os_mac.cnx b/doc/os_mac.cnx
diff --git a/doc/os_mint.cnx b/doc/os_mint.cnx
diff --git a/doc/os_msdos.cnx b/doc/os_msdos.cnx
diff --git a/doc/os_os2.cnx b/doc/os_os2.cnx
diff --git a/doc/os_qnx.cnx b/doc/os_qnx.cnx
diff --git a/doc/os_risc.cnx b/doc/os_risc.cnx
diff --git a/doc/os_unix.cnx b/doc/os_unix.cnx
diff --git a/doc/os_vms.cnx b/doc/os_vms.cnx
diff --git a/doc/os_win32.cnx b/doc/os_win32.cnx
diff --git a/doc/pattern.cnx b/doc/pattern.cnx
diff --git a/doc/pi_getscript.cnx b/doc/pi_getscript.cnx
diff --git a/doc/pi_gzip.cnx b/doc/pi_gzip.cnx
diff --git a/doc/pi_netrw.cnx b/doc/pi_netrw.cnx
diff --git a/doc/pi_paren.cnx b/doc/pi_paren.cnx
diff --git a/doc/pi_spec.cnx b/doc/pi_spec.cnx
diff --git a/doc/pi_tar.cnx b/doc/pi_tar.cnx
diff --git a/doc/pi_vimball.cnx b/doc/pi_vimball.cnx
diff --git a/doc/pi_zip.cnx b/doc/pi_zip.cnx
diff --git a/doc/print.cnx b/doc/print.cnx
diff --git a/doc/quickfix.cnx b/doc/quickfix.cnx
diff --git a/doc/quickref.cnx b/doc/quickref.cnx
diff --git a/doc/quotes.cnx b/doc/quotes.cnx
diff --git a/doc/recover.cnx b/doc/recover.cnx
diff --git a/doc/remote.cnx b/doc/remote.cnx
diff --git a/doc/repeat.cnx b/doc/repeat.cnx
diff --git a/doc/rileft.cnx b/doc/rileft.cnx
diff --git a/doc/russian.cnx b/doc/russian.cnx
diff --git a/doc/scroll.cnx b/doc/scroll.cnx
diff --git a/doc/sign.cnx b/doc/sign.cnx
diff --git a/doc/snipMate.txt b/doc/snipMate.txt
diff --git a/doc/spell.cnx b/doc/spell.cnx
diff --git a/doc/sponsor.cnx b/doc/sponsor.cnx
diff --git a/doc/starting.cnx b/doc/starting.cnx
diff --git a/doc/syntax.cnx b/doc/syntax.cnx
diff --git a/doc/tabpage.cnx b/doc/tabpage.cnx
diff --git a/doc/tags b/doc/tags
diff --git a/doc/tags-cn b/doc/tags-cn
diff --git a/doc/tagsrch.cnx b/doc/tagsrch.cnx
diff --git a/doc/term.cnx b/doc/term.cnx
diff --git a/doc/tips.cnx b/doc/tips.cnx
diff --git a/doc/todo.cnx b/doc/todo.cnx
diff --git a/doc/uganda.cnx b/doc/uganda.cnx
diff --git a/doc/undo.cnx b/doc/undo.cnx
diff --git a/doc/usr_01.cnx b/doc/usr_01.cnx
diff --git a/doc/usr_02.cnx b/doc/usr_02.cnx
diff --git a/doc/usr_03.cnx b/doc/usr_03.cnx
diff --git a/doc/usr_04.cnx b/doc/usr_04.cnx
diff --git a/doc/usr_05.cnx b/doc/usr_05.cnx
diff --git a/doc/usr_06.cnx b/doc/usr_06.cnx
diff --git a/doc/usr_07.cnx b/doc/usr_07.cnx
diff --git a/doc/usr_08.cnx b/doc/usr_08.cnx
diff --git a/doc/usr_09.cnx b/doc/usr_09.cnx
diff --git a/doc/usr_10.cnx b/doc/usr_10.cnx
diff --git a/doc/usr_11.cnx b/doc/usr_11.cnx
diff --git a/doc/usr_12.cnx b/doc/usr_12.cnx
diff --git a/doc/usr_20.cnx b/doc/usr_20.cnx
diff --git a/doc/usr_21.cnx b/doc/usr_21.cnx
diff --git a/doc/usr_22.cnx b/doc/usr_22.cnx
diff --git a/doc/usr_23.cnx b/doc/usr_23.cnx
diff --git a/doc/usr_24.cnx b/doc/usr_24.cnx
diff --git a/doc/usr_25.cnx b/doc/usr_25.cnx
diff --git a/doc/usr_26.cnx b/doc/usr_26.cnx
diff --git a/doc/usr_27.cnx b/doc/usr_27.cnx
diff --git a/doc/usr_28.cnx b/doc/usr_28.cnx
diff --git a/doc/usr_29.cnx b/doc/usr_29.cnx
diff --git a/doc/usr_30.cnx b/doc/usr_30.cnx
diff --git a/doc/usr_31.cnx b/doc/usr_31.cnx
diff --git a/doc/usr_32.cnx b/doc/usr_32.cnx
diff --git a/doc/usr_40.cnx b/doc/usr_40.cnx
diff --git a/doc/usr_41.cnx b/doc/usr_41.cnx
diff --git a/doc/usr_42.cnx b/doc/usr_42.cnx
diff --git a/doc/usr_43.cnx b/doc/usr_43.cnx
diff --git a/doc/usr_44.cnx b/doc/usr_44.cnx
diff --git a/doc/usr_45.cnx b/doc/usr_45.cnx
diff --git a/doc/usr_90.cnx b/doc/usr_90.cnx
diff --git a/doc/usr_toc.cnx b/doc/usr_toc.cnx
diff --git a/doc/various.cnx b/doc/various.cnx
diff --git a/doc/version4.cnx b/doc/version4.cnx
diff --git a/doc/version5.cnx b/doc/version5.cnx
diff --git a/doc/version6.cnx b/doc/version6.cnx
diff --git a/doc/version7.cnx b/doc/version7.cnx
diff --git a/doc/vi_diff.cnx b/doc/vi_diff.cnx
diff --git a/doc/vimpress.txt b/doc/vimpress.txt
diff --git a/doc/visual.cnx b/doc/visual.cnx
diff --git a/doc/windows.cnx b/doc/windows.cnx
diff --git a/doc/wmgraphviz.txt b/doc/wmgraphviz.txt
diff --git a/doc/workshop.cnx b/doc/workshop.cnx
diff --git a/doc/zencoding.txt b/doc/zencoding.txt
diff --git a/ftdetect/gofiletype.vim b/ftdetect/gofiletype.vim
diff --git a/ftdetect/markdown.vim b/ftdetect/markdown.vim
diff --git a/ftplugin/dot.vim b/ftplugin/dot.vim
diff --git a/ftplugin/go/fmt.vim b/ftplugin/go/fmt.vim
diff --git a/ftplugin/go/godoc.vim b/ftplugin/go/godoc.vim
diff --git a/ftplugin/go/import.vim b/ftplugin/go/import.vim
diff --git a/ftplugin/python/pyflakes.vim b/ftplugin/python/pyflakes.vim
diff --git a/ftplugin/python/pyflakes/LICENSE b/ftplugin/python/pyflakes/LICENSE
diff --git a/ftplugin/python/pyflakes/NEWS.txt b/ftplugin/python/pyflakes/NEWS.txt
diff --git a/ftplugin/python/pyflakes/bin/pyflakes b/ftplugin/python/pyflakes/bin/pyflakes
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/__init__.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/__init__.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/checker.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/checker.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/messages.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/messages.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/scripts/__init__.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/scripts/__init__.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/scripts/pyflakes.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/scripts/pyflakes.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/__init__.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/__init__.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/harness.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/harness.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_imports.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_imports.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_other.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_other.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_script.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_script.py
diff --git a/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_undefined_names.py b/ftplugin/python/pyflakes/build/lib.linux-x86_64-2.7/pyflakes/test/test_undefined_names.py
diff --git a/ftplugin/python/pyflakes/build/scripts-2.7/pyflakes b/ftplugin/python/pyflakes/build/scripts-2.7/pyflakes
diff --git a/ftplugin/python/pyflakes/pyflakes/__init__.py b/ftplugin/python/pyflakes/pyflakes/__init__.py
diff --git a/ftplugin/python/pyflakes/pyflakes/__init__.pyc b/ftplugin/python/pyflakes/pyflakes/__init__.pyc
diff --git a/ftplugin/python/pyflakes/pyflakes/checker.py b/ftplugin/python/pyflakes/pyflakes/checker.py
diff --git a/ftplugin/python/pyflakes/pyflakes/checker.pyc b/ftplugin/python/pyflakes/pyflakes/checker.pyc
diff --git a/ftplugin/python/pyflakes/pyflakes/messages.py b/ftplugin/python/pyflakes/pyflakes/messages.py
diff --git a/ftplugin/python/pyflakes/pyflakes/messages.pyc b/ftplugin/python/pyflakes/pyflakes/messages.pyc
diff --git a/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py b/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py
diff --git a/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py b/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
diff --git a/ftplugin/python/pyflakes/pyflakes/test/__init__.py b/ftplugin/python/pyflakes/pyflakes/test/__init__.py
diff --git a/ftplugin/python/pyflakes/pyflakes/test/harness.py b/ftplugin/python/pyflakes/pyflakes/test/harness.py
diff --git a/ftplugin/python/pyflakes/pyflakes/test/test_imports.py b/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
diff --git a/ftplugin/python/pyflakes/pyflakes/test/test_other.py b/ftplugin/python/pyflakes/pyflakes/test/test_other.py
diff --git a/ftplugin/python/pyflakes/pyflakes/test/test_script.py b/ftplugin/python/pyflakes/pyflakes/test/test_script.py
diff --git a/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py b/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
diff --git a/ftplugin/python/pyflakes/setup.py b/ftplugin/python/pyflakes/setup.py
diff --git a/indent/go.vim b/indent/go.vim
diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim
diff --git a/plugin/acp.vim b/plugin/acp.vim
diff --git a/plugin/autoproto.vim b/plugin/autoproto.vim
diff --git a/plugin/blog.vim b/plugin/blog.vim
diff --git a/plugin/calendar.vim b/plugin/calendar.vim
diff --git a/plugin/conque_term.vim b/plugin/conque_term.vim
diff --git a/plugin/cscope_maps.vim b/plugin/cscope_maps.vim
diff --git a/plugin/echofunc.vim b/plugin/echofunc.vim
diff --git a/plugin/fcitx.py b/plugin/fcitx.py
diff --git a/plugin/fcitx.vim b/plugin/fcitx.vim
diff --git a/plugin/fencview.vim b/plugin/fencview.vim
diff --git a/plugin/godoc.vim b/plugin/godoc.vim
diff --git a/plugin/hammer.vim/assets/images/cloudapp/body-bg.png b/plugin/hammer.vim/assets/images/cloudapp/body-bg.png
diff --git a/plugin/hammer.vim/assets/images/cloudapp/header-bg.png b/plugin/hammer.vim/assets/images/cloudapp/header-bg.png
diff --git a/plugin/hammer.vim/assets/stylesheets/cloudapp.css b/plugin/hammer.vim/assets/stylesheets/cloudapp.css
diff --git a/plugin/hammer.vim/assets/stylesheets/default.css b/plugin/hammer.vim/assets/stylesheets/default.css
diff --git a/plugin/hammer.vim/assets/stylesheets/github_old.css b/plugin/hammer.vim/assets/stylesheets/github_old.css
diff --git a/plugin/hammer.vim/assets/stylesheets/sphinx.css b/plugin/hammer.vim/assets/stylesheets/sphinx.css
diff --git a/plugin/hammer.vim/assets/stylesheets/typographic-light.css b/plugin/hammer.vim/assets/stylesheets/typographic-light.css
diff --git a/plugin/hammer.vim/bootstrap.vim b/plugin/hammer.vim/bootstrap.vim
diff --git a/plugin/hammer.vim/lib/hammer.rb b/plugin/hammer.vim/lib/hammer.rb
diff --git a/plugin/hammer.vim/lib/hammer/env.rb b/plugin/hammer.vim/lib/hammer/env.rb
diff --git a/plugin/hammer.vim/lib/vim-windows/rubygems.rb b/plugin/hammer.vim/lib/vim-windows/rubygems.rb
diff --git a/plugin/hammer.vim/lib/vim/improvedbuffer.rb b/plugin/hammer.vim/lib/vim/improvedbuffer.rb
diff --git a/plugin/hammer.vim/renderers/html_renderer.rb b/plugin/hammer.vim/renderers/html_renderer.rb
diff --git a/plugin/hammer.vim/renderers/markdown_renderer.rb b/plugin/hammer.vim/renderers/markdown_renderer.rb
diff --git a/plugin/hammer.vim/renderers/perl_renderer.rb b/plugin/hammer.vim/renderers/perl_renderer.rb
diff --git a/plugin/hammer.vim/templates/cloudapp.html.erb b/plugin/hammer.vim/templates/cloudapp.html.erb
diff --git a/plugin/hammer.vim/templates/default.html.erb b/plugin/hammer.vim/templates/default.html.erb
diff --git a/plugin/hammer.vim/templates/default_inline.html.erb b/plugin/hammer.vim/templates/default_inline.html.erb
diff --git a/plugin/hammer.vim/templates/sphinx.html.erb b/plugin/hammer.vim/templates/sphinx.html.erb
diff --git a/plugin/hammer.vim/templates/typographic-light.html.erb b/plugin/hammer.vim/templates/typographic-light.html.erb
diff --git a/plugin/libvimim.dll b/plugin/libvimim.dll
diff --git a/plugin/libvimim.so b/plugin/libvimim.so
diff --git a/plugin/mark.vba b/plugin/mark.vba
diff --git a/plugin/mark.vim b/plugin/mark.vim
diff --git a/plugin/markdown-1.2.2.vba b/plugin/markdown-1.2.2.vba
diff --git a/plugin/pyflakes-vim.zip b/plugin/pyflakes-vim.zip
diff --git a/plugin/python.vim b/plugin/python.vim
diff --git a/plugin/python_fn.vim b/plugin/python_fn.vim
diff --git a/plugin/snipMate.vim.bak b/plugin/snipMate.vim.bak
diff --git a/plugin/supertab.vim b/plugin/supertab.vim
diff --git a/plugin/taglist.vim b/plugin/taglist.vim
diff --git a/plugin/tasklist.vim b/plugin/tasklist.vim
@@ -366,7 +366,7 @@ command! TaskList call s:TaskList()
 
 " Default key map
 if !hasmapto('<Plug>TaskList')
-    map <unique> <Leader>t <Plug>TaskList
+    map <unique> <Leader>T <Plug>TaskList
 endif
 
 " Key map to Command

diff --git a/plugin/tasklist.vim.bak b/plugin/tasklist.vim.bak
diff --git a/plugin/test.vim b/plugin/test.vim
diff --git a/plugin/translate.vim b/plugin/translate.vim
diff --git a/plugin/txt.vim b/plugin/txt.vim
diff --git a/plugin/vimcdoc.vim b/plugin/vimcdoc.vim
diff --git a/plugin/vimim.cjk.txt b/plugin/vimim.cjk.txt
diff --git a/plugin/vimim.txt b/plugin/vimim.txt
diff --git a/plugin/vimim.vim b/plugin/vimim.vim
diff --git a/plugin/zencoding-vim.zip b/plugin/zencoding-vim.zip
diff --git a/plugin/zencoding.vim b/plugin/zencoding.vim
diff --git a/snippets/_.snippets b/snippets/_.snippets
diff --git a/snippets/autoit.snippets b/snippets/autoit.snippets
diff --git a/snippets/c.snippets b/snippets/c.snippets
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
diff --git a/snippets/dot.snippets b/snippets/dot.snippets
diff --git a/snippets/java.snippets b/snippets/java.snippets
diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
diff --git a/snippets/mako.snippets b/snippets/mako.snippets
diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
diff --git a/snippets/objc.snippets b/snippets/objc.snippets
diff --git a/snippets/perl.snippets b/snippets/perl.snippets