@@ -16,6 +16,8 @@ au FileType c setlocal dict+=~/.vim/dict/c.dict
16
16
au FileType cpp setlocal dict += ~/.vim/dict/cpp.dict
17
17
au FileType scale setlocal dict += ~/.vim/dict/scale.dict
18
18
au FileType javascript setlocal dict += ~/.vim/dict/javascript.dict
19
+ au FileType html setlocal dict += ~/.vim/dict/javascript.dict
20
+ au FileType html setlocal dict += ~/.vim/dict/css.dict
19
21
20
22
"
21
23
" syntastic相关
@@ -62,7 +64,7 @@ set tabstop=4
62
64
set softtabstop = 4
63
65
set shiftwidth = 4
64
66
" 不要用空格代替制表符
65
- set noexpandtab
67
+ set expandtab
66
68
" 在行和段开始处使用制表符
67
69
set smarttab
68
70
" 显示行号
@@ -96,6 +98,8 @@ au BufRead,BufNewFile *.{js} set filetype=javascript
96
98
" rkdown to HTML
97
99
nmap md :!~/.vim/markdown.pl % > %.html <CR><CR>
98
100
nmap fi :!firefox %.html & <CR><CR>
101
+ nmap \ \cc
102
+ vmap \ \cc
99
103
100
104
" 将tab替换为空格
101
105
nmap tt :%s/\t/ /g<CR>
@@ -169,6 +173,8 @@ set mouse=v
169
173
nnoremap <F2> :g/^\s*$/d<CR>
170
174
" 比较文件
171
175
nnoremap <C-F2> :vert diffsplit
176
+ " nnoremap <Leader>fu :CtrlPFunky<Cr>
177
+ " nnoremap <C-n> :CtrlPFunky<Cr>
172
178
" 列出当前目录文件
173
179
map <F3> :NERDTree<CR>
174
180
" 打开树状文件目录
@@ -264,13 +270,13 @@ autocmd FileType c,cpp map <buffer> <leader><space> :w<cr>:make<cr>
264
270
" 代码补全
265
271
set completeopt = preview,menu
266
272
" 允许插件
267
- filetype plugin on
273
+ " filetype plugin on
268
274
" 共享剪贴板
269
275
" set clipboard+=unnamed
270
276
" 自动保存
271
277
set autowrite
272
- set ruler " 打开状态栏标尺
273
- set cursorline " 突出显示当前行
278
+ " set ruler " 打开状态栏标尺
279
+ " set cursorline " 突出显示当前行
274
280
set magic " 设置魔术
275
281
set guioptions -= T " 隐藏工具栏
276
282
set guioptions -= m " 隐藏菜单栏
@@ -398,12 +404,9 @@ let g:miniBufExplModSelTarget = 1
398
404
399
405
400
406
set iskeyword += .
401
- set fileencodings = utf- 8
402
407
set termencoding = utf- 8
403
408
set encoding = utf8
404
- set fileencoding = utf8
405
409
set fileencodings = utf8,ucs- bom,gbk,cp936,gb2312,gb18030
406
- let &termencoding = &encoding
407
410
408
411
autocmd FileType python set omnifunc = pythoncomplete#Complete
409
412
@@ -439,12 +442,19 @@ Bundle 'synmark.vim'
439
442
" Bundle 'Python-mode-klen'
440
443
Bundle ' SQLComplete.vim'
441
444
Bundle ' Javascript-OmniCompletion-with-YUI-and-j'
442
- Bundle ' JavaScript-Indent'
443
- Bundle ' Better-Javascript-Indentation'
445
+ " Bundle 'JavaScript-Indent'
446
+ " Bundle 'Better-Javascript-Indentation'
444
447
Bundle ' jslint.vim'
445
448
Bundle " pangloss/vim-javascript"
446
449
Bundle ' Vim-Script-Updater'
450
+ Bundle ' ctrlp.vim'
451
+ Bundle ' tacahiroy/ctrlp-funky'
447
452
Bundle ' jsbeautify'
453
+ Bundle ' The-NERD-Commenter'
454
+ " django
455
+ Bundle ' django_templates.vim'
456
+ Bundle ' Django-Projects'
457
+
448
458
" Bundle 'FredKSchott/CoVim'
449
459
" Bundle 'djangojump'
450
460
" ...
@@ -462,3 +472,15 @@ filetype plugin indent on " required!
462
472
"
463
473
" see :h vundle for more details or wiki for FAQ
464
474
" NOTE: comments after Bundle command are not allowed..
475
+ "
476
+ "
477
+ " ctrlp设置
478
+ "
479
+ set wildignore += * /tmp/ * ,* .so ,* .swp,* .zip,* .pyc,* .png,* .jpg,* .gif " MacOSX/Linux
480
+ set wildignore += * \\ tmp\\ * ,* .swp,* .zip,* .exe ,* .pyc,* .png,* .jpg,* .gif " Windows
481
+
482
+ let g: ctrlp_custom_ignore = ' \v[\/]\.(git|hg|svn)$'
483
+ let g: ctrlp_custom_ignore = ' \v\.(exe|so|dll)$'
484
+ let g: ctrlp_extensions = [' funky' ]
485
+
486
+ let NERDTreeIgnore= [' \.pyc' ]
0 commit comments