aboutsummaryrefslogtreecommitdiffhomepage
path: root/vim/init
diff options
context:
space:
mode:
Diffstat (limited to 'vim/init')
-rw-r--r--vim/init/basic.vim11
-rw-r--r--vim/init/tabsize.vim35
2 files changed, 11 insertions, 35 deletions
diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 8c92886..b74f988 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -11,6 +11,7 @@
11" JUMP 11" JUMP
12" SEARCH 12" SEARCH
13" BUFFERS 13" BUFFERS
14" TABSIZE
14" ENCODING_PREFERENCE 15" ENCODING_PREFERENCE
15" FOLDING 16" FOLDING
16" BACKUP 17" BACKUP
@@ -179,6 +180,16 @@ function SetPasswordFile()
179endfunction 180endfunction
180 181
181 182
183"----------------------------------------------------------------------
184" TABSIZE
185"----------------------------------------------------------------------
186set expandtab
187set shiftwidth=2
188set autoindent
189set tabstop=4
190set softtabstop=0
191set smartindent
192
182 193
183"---------------------------------------------------------------------- 194"----------------------------------------------------------------------
184" ENCODING_PREFERENCE 195" ENCODING_PREFERENCE
diff --git a/vim/init/tabsize.vim b/vim/init/tabsize.vim
deleted file mode 100644
index 6cb0f63..0000000
--- a/vim/init/tabsize.vim
+++ /dev/null
@@ -1,35 +0,0 @@
1"======================================================================
2"
3" init-tabsize.vim - 大部分人对 tabsize 都有自己的设置,改这里即可
4"
5" Created by skywind on 2018/05/30
6" Last Modified: 2018/05/30 22:05:44
7"
8"======================================================================
9" vim: set ts=4 sw=4 tw=78 noet :
10
11
12"----------------------------------------------------------------------
13" 默认缩进模式(可以后期覆盖)
14"----------------------------------------------------------------------
15
16set expandtab
17set shiftwidth=2
18set autoindent
19set tabstop=4
20set softtabstop=0
21set smartindent
22
23" 设置缩进宽度
24"set sw=4
25
26" 设置 TAB 宽度
27set ts=2
28
29" 禁止展开 tab (noexpandtab)
30"set noet
31
32" 如果后面设置了 expandtab 那么展开 tab 为多少字符
33set tabstop=4
34set softtabstop=0
35