diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-08 13:55:18 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-08 13:55:18 +1300 |
commit | 8ddb8ba683cee22f930dd48d85a117ce07be5cac (patch) | |
tree | 47bbb9e862b227d758ebb9643ab23f649c463d8c /vim/ftdetect | |
parent | Merge branch 'hotfix/v0.11.1' (diff) | |
parent | Update dotfiles(7) manual from README.md (diff) | |
download | dotfiles-8ddb8ba683cee22f930dd48d85a117ce07be5cac.tar.gz dotfiles-8ddb8ba683cee22f930dd48d85a117ce07be5cac.zip |
Merge branch 'release/v0.12.0'v0.12.0
* release/v0.12.0:
Update dotfiles(7) manual from README.md
Bump version to 0.12.0
Use "nunmap" not "unmap" for b:undo_* var
Remove null command from b:undo_* variables
Use consistent/thorough ftplugin/indent unloading
Add clustering for POSIX shell syntax groups
Add `kill` as shStatement
Add `break`, `continue`, `return` as shStatement
Override commands and variables for syntax/sh.vim
Disable unwanted shell error syntax for any shell
Break a long conditional in vim/ftdetect/sh.vim
Rename b:check and b:lint with sh_ prefix
Remove overkill defined-and-false check of sh vars
Clear b:check/lint in ftdetect/sh.vim b:undo
Move ftplugin/sh.vim b:undo def to end of file
Use correct undo variable name in ftplugin/sh.vim
Remove superfluous augroups around ftdetect defs
Use sh.vim local vars not global POSIX hacks
Spell-checked and corrected README.md
Diffstat (limited to 'vim/ftdetect')
-rw-r--r-- | vim/ftdetect/csv.vim | 9 | ||||
-rw-r--r-- | vim/ftdetect/muttrc.vim | 9 | ||||
-rw-r--r-- | vim/ftdetect/sh.vim | 34 | ||||
-rw-r--r-- | vim/ftdetect/tsv.vim | 9 | ||||
-rw-r--r-- | vim/ftdetect/xdefaults.vim | 9 |
5 files changed, 27 insertions, 43 deletions
diff --git a/vim/ftdetect/csv.vim b/vim/ftdetect/csv.vim index e5a38e10..a234c093 100644 --- a/vim/ftdetect/csv.vim +++ b/vim/ftdetect/csv.vim @@ -1,7 +1,4 @@ " Add automatic commands to detect CSV files -augroup dotfiles_ftdetect_csv - autocmd! - autocmd BufNewFile,BufRead - \ *.csv - \ setfiletype csv -augroup END +autocmd BufNewFile,BufRead + \ *.csv + \ setfiletype csv diff --git a/vim/ftdetect/muttrc.vim b/vim/ftdetect/muttrc.vim index 0f625f2b..55eeea93 100644 --- a/vim/ftdetect/muttrc.vim +++ b/vim/ftdetect/muttrc.vim @@ -1,7 +1,4 @@ " Add automatic commands to detect .muttrc files -augroup dotfiles_ftdetect_muttrc - autocmd! - autocmd BufNewFile,BufRead - \ **/.dotfiles/mutt/muttrc.d/*.rc,**/.muttrc.d/*.rc - \ setfiletype muttrc -augroup END +autocmd BufNewFile,BufRead + \ **/.dotfiles/mutt/muttrc.d/*.rc,**/.muttrc.d/*.rc + \ setfiletype muttrc diff --git a/vim/ftdetect/sh.vim b/vim/ftdetect/sh.vim index f00a5659..880f08e9 100644 --- a/vim/ftdetect/sh.vim +++ b/vim/ftdetect/sh.vim @@ -1,23 +1,19 @@ " Add automatic commands to choose shell flavours based on filename pattern -augroup dotfiles_ftdetect_sh - autocmd! - " Names/paths of things that are Bash shell script - autocmd BufNewFile,BufRead - \ **/.dotfiles/bash/**,bash-fc-* - \ let b:is_bash = 1 - \ | setfiletype sh +" Names/paths of things that are Bash shell script +autocmd BufNewFile,BufRead + \ **/.dotfiles/bash/**,bash-fc-* + \ let b:is_bash = 1 + \ | setfiletype sh - " Names/paths of things that are Korn shell script - autocmd BufNewFile,BufRead - \ **/.dotfiles/ksh/**,.kshrc,*.ksh - \ let b:is_kornshell = 1 - \ | setfiletype sh +" Names/paths of things that are Korn shell script +autocmd BufNewFile,BufRead + \ **/.dotfiles/ksh/**,.kshrc,*.ksh + \ let b:is_kornshell = 1 + \ | setfiletype sh - " Names/paths of things that are POSIX shell script - autocmd BufNewFile,BufRead - \ **/.dotfiles/sh/**,.shinit,.shrc,.xinitrc,/etc/default/* - \ let b:is_posix = 1 - \ | setfiletype sh - -augroup END +" Names/paths of things that are POSIX shell script +autocmd BufNewFile,BufRead + \ **/.dotfiles/sh/**,.shinit,.shrc,.xinitrc,/etc/default/* + \ let b:is_posix = 1 + \ | setfiletype sh diff --git a/vim/ftdetect/tsv.vim b/vim/ftdetect/tsv.vim index 673721f5..a345ac65 100644 --- a/vim/ftdetect/tsv.vim +++ b/vim/ftdetect/tsv.vim @@ -1,7 +1,4 @@ " Add automatic commands to detect TSV files -augroup dotfiles_ftdetect_tsv - autocmd! - autocmd BufNewFile,BufRead - \ *.tsv - \ setfiletype tsv -augroup END +autocmd BufNewFile,BufRead + \ *.tsv + \ setfiletype tsv diff --git a/vim/ftdetect/xdefaults.vim b/vim/ftdetect/xdefaults.vim index 1529e5c9..f45a22a7 100644 --- a/vim/ftdetect/xdefaults.vim +++ b/vim/ftdetect/xdefaults.vim @@ -1,7 +1,4 @@ " Add automatic commands to find Xresources subfiles -augroup dotfiles_ftdetect_xdefaults - autocmd! - autocmd BufNewFile,BufRead - \ **/.Xresources.d/* - \ setfiletype xdefaults -augroup END +autocmd BufNewFile,BufRead + \ **/.Xresources.d/* + \ setfiletype xdefaults |