diff options
Diffstat (limited to 'vim/indent')
-rw-r--r-- | vim/indent/_GLOBAL.vim | 12 | ||||
-rw-r--r-- | vim/indent/c.vim | 2 | ||||
-rw-r--r-- | vim/indent/csv.vim | 5 | ||||
-rw-r--r-- | vim/indent/html.vim | 2 | ||||
-rw-r--r-- | vim/indent/perl.vim | 2 | ||||
-rw-r--r-- | vim/indent/php.vim | 3 | ||||
-rw-r--r-- | vim/indent/sh.vim | 2 | ||||
-rw-r--r-- | vim/indent/tsv.vim | 5 | ||||
-rw-r--r-- | vim/indent/vim.vim | 10 |
9 files changed, 11 insertions, 32 deletions
diff --git a/vim/indent/_GLOBAL.vim b/vim/indent/_GLOBAL.vim deleted file mode 100644 index d0bdea26..00000000 --- a/vim/indent/_GLOBAL.vim +++ /dev/null @@ -1,12 +0,0 @@ -" Source this file (probably with :runtime) to explicitly set local indent -" settings for a buffer back to the global settings, in case it was changed -" by a prior filetype (e.g. VimL). -setlocal autoindent< -setlocal expandtab< - -" Unfortunately, older versions of Vim (6.2 is known) accept neither the -" `option<` nor `option=` syntax for resetting these numeric values, so we do -" it this clunkier way. -execute 'setlocal shiftwidth=' . &g:shiftwidth -execute 'setlocal softtabstop=' . &g:softtabstop -execute 'setlocal tabstop=' . &g:tabstop diff --git a/vim/indent/c.vim b/vim/indent/c.vim deleted file mode 100644 index fd1b26af..00000000 --- a/vim/indent/c.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim index 8f98d915..682bc3a8 100644 --- a/vim/indent/csv.vim +++ b/vim/indent/csv.vim @@ -1,6 +1,5 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim - " Manual indenting and literal tabs for CSVs setlocal noautoindent setlocal noexpandtab +let b:undo_user_indent + \ = 'setlocal autoindent< expandtab<' diff --git a/vim/indent/html.vim b/vim/indent/html.vim deleted file mode 100644 index fd1b26af..00000000 --- a/vim/indent/html.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim diff --git a/vim/indent/perl.vim b/vim/indent/perl.vim deleted file mode 100644 index fd1b26af..00000000 --- a/vim/indent/perl.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim diff --git a/vim/indent/php.vim b/vim/indent/php.vim index 025bf3f1..d0fb1f8f 100644 --- a/vim/indent/php.vim +++ b/vim/indent/php.vim @@ -1,6 +1,3 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim - " Lie to the php.vim indent file and tell it that it's already loaded itself, " to stop it processing its ridiculous expression-based indenting that never " seems to do what I want. Just plain autoindent is fine. diff --git a/vim/indent/sh.vim b/vim/indent/sh.vim deleted file mode 100644 index fd1b26af..00000000 --- a/vim/indent/sh.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim diff --git a/vim/indent/tsv.vim b/vim/indent/tsv.vim index a38e53e8..951b3e60 100644 --- a/vim/indent/tsv.vim +++ b/vim/indent/tsv.vim @@ -1,6 +1,5 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim - " Manual indenting and literal tabs for TSVs setlocal noautoindent setlocal noexpandtab +let b:undo_user_indent + \ = 'setlocal autoindent< expandtab<' diff --git a/vim/indent/vim.vim b/vim/indent/vim.vim index 3b038349..047a353d 100644 --- a/vim/indent/vim.vim +++ b/vim/indent/vim.vim @@ -1,7 +1,11 @@ -" Restore local indent settings to the global values -runtime indent/_GLOBAL.vim - " Observe VimL conventions for two-space indents setlocal shiftwidth=2 setlocal softtabstop=2 setlocal tabstop=2 + +" Ancient Vim can't use the '<' suffix syntax for resetting local integer +" options +if v:version > 700 + let b:undo_user_indent + \ = 'setlocal shiftwidth< softtabstop< tabstop<' +endif |