diff options
Diffstat (limited to 'vim/config')
| -rw-r--r-- | vim/config/files.vim | 4 | ||||
| -rw-r--r-- | vim/config/syntax.vim | 2 | ||||
| -rw-r--r-- | vim/config/whitespace.vim | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/vim/config/files.vim b/vim/config/files.vim index 7a23b4c5..61c3b6cb 100644 --- a/vim/config/files.vim +++ b/vim/config/files.vim @@ -18,10 +18,6 @@ if has('file_in_path') set path=** endif -" Try Mac line-endings if UNIX or DOS don't make sense; this has never -" happened to me but who knows, it might one day -set fileformats+=mac - " If the Vim buffer for a file doesn't have any changes and Vim detects the " file has been altered, quietly update it set autoread diff --git a/vim/config/syntax.vim b/vim/config/syntax.vim index b493c0a9..00004e35 100644 --- a/vim/config/syntax.vim +++ b/vim/config/syntax.vim @@ -1,5 +1,5 @@ " Options dependent on the syntax feature -if has('syntax') +if has('syntax') && !has('g:syntax_on') " Use syntax highlighting with 100 lines of context silent! syntax enable diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim index 981def81..0d985f15 100644 --- a/vim/config/whitespace.vim +++ b/vim/config/whitespace.vim @@ -1,5 +1,4 @@ -" Adopt the indent of the last line on new lines; interestingly, plugins that -" do clever things with indenting will often assume this is set +" Adopt the indent of the last line on new lines set autoindent " Use spaces instead of tabs |