Skip to content

Commit

Permalink
fix javascript indent bug
Browse files Browse the repository at this point in the history
  • Loading branch information
ma6174 committed Jun 11, 2013
1 parent 59774b6 commit b179571
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
10 changes: 9 additions & 1 deletion .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ set sw=4
set ts=4
set et
set smarttab
set smartindent
set lbr
set fo+=mB
set sm
Expand Down Expand Up @@ -91,6 +92,7 @@ set iskeyword+=_,$,@,%,#,-
"markdown配置
au BufRead,BufNewFile *.{md,mdown,mkd,mkdn,markdown,mdwn} set filetype=mkd
au BufRead,BufNewFile *.{go} set filetype=go
au BufRead,BufNewFile *.{js} set filetype=javascript
"rkdown to HTML
nmap md :!~/.vim/markdown.pl % > %.html <CR><CR>
nmap fi :!firefox %.html & <CR><CR>
Expand Down Expand Up @@ -231,6 +233,7 @@ func FormartSrc()
exec "!astyle --style=gnu --suffix=none %"
else
exec "normal gg=G"
return
endif
exec "e! %"
endfunc
Expand Down Expand Up @@ -311,7 +314,6 @@ set matchtime=1
" 光标移动到buffer的顶部和底部时保持3行距离
set scrolloff=3
" 为C程序提供自动缩进
set smartindent
"自动补全
"":inoremap ( ()<ESC>i
"":inoremap ) <c-r>=ClosePair(')')<CR>
Expand Down Expand Up @@ -440,9 +442,15 @@ Bundle 'Javascript-OmniCompletion-with-YUI-and-j'
Bundle 'JavaScript-Indent'
Bundle 'Better-Javascript-Indentation'
Bundle 'jslint.vim'
Bundle "pangloss/vim-javascript"
Bundle 'Vim-Script-Updater'
Bundle 'jsbeautify'
"Bundle 'FredKSchott/CoVim'
"Bundle 'djangojump'
" ...
let g:html_indent_inctags = "html,body,head,tbody"
let g:html_indent_script1 = "inc"
let g:html_indent_style1 = "inc"

filetype plugin indent on " required!
"
Expand Down
1 change: 1 addition & 0 deletions bundle/Vim-Script-Updater
Submodule Vim-Script-Updater added at f33f67
1 change: 1 addition & 0 deletions bundle/jsbeautify
Submodule jsbeautify added at 0a1856
1 change: 1 addition & 0 deletions bundle/vim-javascript
Submodule vim-javascript added at b21629
1 change: 1 addition & 0 deletions update_log.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- 增加javascript插件
- 增加常见的dict
- 完善`<F6>`对javascript的支持

### 2013年5月31日更新

Expand Down

0 comments on commit b179571

Please sign in to comment.