diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-26 11:18:13 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-26 11:18:13 +1200 |
commit | 6ed7e3c18378f627488f20d6af00de1a89fe5042 (patch) | |
tree | fbacf8e72729db38089c293b29fc79023aeeb327 /vim/filetype.vim | |
parent | Merge branch 'release/v1.5.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-6ed7e3c18378f627488f20d6af00de1a89fe5042.tar.gz dotfiles-6ed7e3c18378f627488f20d6af00de1a89fe5042.zip |
Merge branch 'release/v1.6.0'v1.6.0
* release/v1.6.0:
Bump VERSION
Update clear_local_maps.vim plugin
Clear away VimL mapping rubbish
Refactor filetype-specific .vimrc material
Remap normal J only if loading plugins
Diffstat (limited to 'vim/filetype.vim')
-rw-r--r-- | vim/filetype.vim | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vim/filetype.vim b/vim/filetype.vim index 69847ba7..66b26455 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -324,15 +324,15 @@ augroup filetypedetect \,bash_logout \,bash_profile \,bashrc - \ let b:is_bash = 1 - \ | setfiletype sh + \ let b:is_bash = 1 + \|setfiletype sh " Korn shell autocmd BufNewFile,BufRead \ ?*.ksh \,.kshrc \,kshrc - \ let b:is_kornshell = 1 - \ | setfiletype sh + \ let b:is_kornshell = 1 + \|setfiletype sh " POSIX/Bourne shell autocmd BufNewFile,BufRead \ ?*.sh @@ -347,8 +347,8 @@ augroup filetypedetect \,shinit \,shrc \,xinitrc - \ let b:is_posix = 1 - \ | setfiletype sh + \ let b:is_posix = 1 + \|setfiletype sh " sed files autocmd BufNewFile,BufRead \ ?*.sed @@ -495,17 +495,17 @@ augroup filetypedetect " been found; strip temporary extension and re-run autocmd BufNewFile,BufRead \ /var/tmp/?*.???????? - \ if !did_filetype() - \ | call s:StripRepeat() - \ | endif + \ if !did_filetype() + \| call s:StripRepeat() + \|endif " If we *still* don't have a filetype, run the scripts.vim file that will " examine actual file contents--but only the first one; don't load the " system one at all autocmd BufNewFile,BufRead,StdinReadPost \ * - \ if !did_filetype() - \ | runtime scripts.vim - \ | endif + \ if !did_filetype() + \| runtime scripts.vim + \|endif augroup END |