Przeglądaj źródła

remove pathogen autoload symlink, activate matchit.vim

Thought I had removed that symlink a long time ago... must have done on a
forgotten branch. Also rename repository, and activate built-in matchit.vim.
Weiyi Lou 12 lat temu
rodzic
commit
3a36b5cdc7
3 zmienionych plików z 12 dodań i 3 usunięć
  1. 2 2
      .gitmodules
  2. 0 0
      vim/bundle/vim-pathogen
  3. 10 1
      vim/vimrc

+ 2 - 2
.gitmodules

@@ -1,5 +1,5 @@
-[submodule "vim/bundle/pathogen"]
-  path = vim/bundle/pathogen
+[submodule "vim/bundle/vim-pathogen"]
+  path = vim/bundle/vim-pathogen
   url = https://github.com/tpope/vim-pathogen.git
 [submodule "vim/bundle/nerdtree"]
   path = vim/bundle/nerdtree

+ 0 - 0
vim/bundle/pathogen → vim/bundle/vim-pathogen


+ 10 - 1
vim/vimrc

@@ -1,9 +1,9 @@
 set nocompatible    " Don't have to try to be compatible with old vi
-set encoding=utf-8
 
 """"""""
 "" Plugin Loading with Pathogen
 """""""""""""""""""""""""""""""""""""""""""""""""""
+runtime bundle/vim-pathogen/autoload/pathogen.vim
 call pathogen#infect()
 call pathogen#helptags()
 
@@ -12,6 +12,7 @@ call pathogen#helptags()
 "" General Behaviours
 """""""""""""""""""""""""""""""""""""""""""""""""""
 
+set encoding=utf-8
 set splitbelow    " New splits appear below current window instead of above
 set splitright    " New splits appear right of current window
 set ttyfast       " Smooth movement
@@ -359,6 +360,14 @@ let g:vim_markdown_folding_disabled = 1
 let g:sparkupNextMapping = '<leader>n' " resolve conflict with vim-multiple-cursors
 
 
+""""""""" MatchIt
+" matchit.vim included in vim since 6.0. Load it if there isn't a newer version.
+" (from sensible.vim)
+if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
+  runtime! macros/matchit.vim
+endif
+
+
 """"""""
 "" Functions
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""