Merge 43734f4d3b into 44dca49794

.gitignore

@@ -4,7 +4,5 @@ temp_dirs/yankring_history_v2.txt
 sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
 sources_non_forked/ctrlp.vim/doc/tags*
-my_plugins/
-my_configs.vim
 tags
 .DS_Store

my_plugins/emmet-vim

@@ -0,0 +1 @@
+Subproject commit 7a4bf3463ef1e2c08393218fc67a8729c00948a5

my_plugins/html5.vim

@@ -0,0 +1 @@
+Subproject commit 3db896baa26839b866db3db5d8997cc830874a24

my_plugins/vim-javascript

@@ -0,0 +1 @@
+Subproject commit dd84369d731bcb8feee0901cbb9b63a2b219bf28

my_plugins/vim-nerdtree-tabs

@@ -0,0 +1 @@
+Subproject commit 5fc6c6857028a07e8fe50f0adef28fb20218776b

my_plugins/vim-vue

@@ -0,0 +1 @@
+Subproject commit 720ca48e0207f2aca331b9d949ce9d4ff5702737

vimrcs/basic.vim

@@ -111,6 +111,12 @@ set showmatch
 " How many tenths of a second to blink when matching brackets
 set mat=2
 
+set number
+
+" emmet-vim的快速闭合标签
+let g:user_emmet_leader_key='<C-Z>'
+autocmd FileType html,css,vue,ejs,wxml,wxss EmmetInstall
+
 " No annoying sound on errors
 set noerrorbells
 set novisualbell
@@ -179,8 +185,8 @@ set expandtab
 set smarttab
 
 " 1 tab == 4 spaces
-set shiftwidth=4
-set tabstop=4
+set shiftwidth=2
+set tabstop=2
 
 " Linebreak on 500 characters
 set lbr
@@ -380,3 +386,27 @@ function! VisualSelection(direction, extra_filter) range
     let @/ = l:pattern
     let @" = l:saved_reg
 endfunction
+
+
+
+
+
+
+
+
+
+
+
+" 我的自定义配置
+autocmd BufRead,BufNewFile *.vue setlocal filetype=vue.html.javascript.css
+autocmd FileType vue syntax sync fromstart
+
+
+
+
+
+
+
+
+
+

vimrcs/extended.vim

@@ -10,7 +10,7 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Set font according to system
 if has("mac") || has("macunix")
-    set gfn=IBM\ Plex\ Mono:h14,Hack:h14,Source\ Code\ Pro:h15,Menlo:h15
+    set gfn=IBM\ Plex\ Mono:h16,Hack:h16,Source\ Code\ Pro:h16,Menlo:h16
 elseif has("win16") || has("win32")
     set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
 elseif has("gui_gtk2")

vimrcs/plugins_config.vim

@@ -77,8 +77,11 @@ set grepprg=/bin/grep\ -nH
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Nerd Tree
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-let g:NERDTreeWinPos = "right"
-let NERDTreeShowHidden=0
+let g:NERDTreeWinPos = "left"
+let NERDTreeShowHidden=1
+" 在终端启动vim时，共享NERDTree
+let g:nerdtree_tabs_open_on_console_startup=1
+let NERDTreeIgnore=['\.pyc','\~$','\.swp','.DS_Store']
 let NERDTreeIgnore = ['\.pyc$', '__pycache__']
 let g:NERDTreeWinSize=35
 map <leader>nn :NERDTreeToggle<cr>