aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-02-18 17:15:19 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-02-18 17:15:19 +1300
commit1cd051f6b0274dbfd1a5dc7245c92bc9770a5c6b (patch)
tree797a9b09b4c8a1b18511942dfe5639e1dc751142
parent216808840a2f9d00740ce52d60da44fc375f72d4 (diff)
parent2cc4c3bfc66bcfb128250f419ef17d00bae1b699 (diff)
downloaddotfiles-1cd051f6b0274dbfd1a5dc7245c92bc9770a5c6b.tar.gz
Merge branch 'release/v0.30.0'v0.30.0
* release/v0.30.0: Bump VERSION Turn off Vim 'softtabstop' for CSV and TSV files Remove 'smarttab' setting Check for 'esckeys' option for NeoVim
-rw-r--r--VERSION4
-rw-r--r--vim/config/terminal.vim4
-rw-r--r--vim/config/whitespace.vim4
-rw-r--r--vim/indent/csv.vim3
-rw-r--r--vim/indent/tsv.vim3
5 files changed, 9 insertions, 9 deletions
diff --git a/VERSION b/VERSION
index 42d2cb6f..98741dab 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.29.0
-Fri Feb 16 09:13:46 UTC 2018
+tejr dotfiles v0.30.0
+Sun Feb 18 04:14:53 UTC 2018
diff --git a/vim/config/terminal.vim b/vim/config/terminal.vim
index 202705a7..04ec5653 100644
--- a/vim/config/terminal.vim
+++ b/vim/config/terminal.vim
@@ -7,7 +7,9 @@ set pastetoggle=<F10>
" Don't bother about checking whether Escape is being used as a means to enter
" a Meta-key combination, just register Escape immediately
-set noesckeys
+if exists('+esckeys')
+ set noesckeys
+endif
" Don't bother drawing the screen while executing macros or other automated or
" scripted processes, just draw the screen as it is when the operation
diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim
index 0d985f15..99974cb1 100644
--- a/vim/config/whitespace.vim
+++ b/vim/config/whitespace.vim
@@ -10,10 +10,6 @@ set shiftwidth=4
" Insert four spaces when Tab is pressed
set softtabstop=4
-" Indent intelligently to 'shiftwidth' at the starts of lines with Tab, but
-" use 'tabstop' everywhere else
-set smarttab
-
" When indenting lines with < or >, round the indent to a multiple of
" 'shiftwidth', so even if the line is indented by one space it will indent
" up to 4 and down to 0, for example
diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim
index 938bc99d..fd3c99de 100644
--- a/vim/indent/csv.vim
+++ b/vim/indent/csv.vim
@@ -7,4 +7,5 @@ let b:did_indent = 1
" Manual indenting and literal tabs for CSVs
setlocal noautoindent
setlocal noexpandtab
-let b:undo_indent = 'setlocal autoindent< expandtab<'
+setlocal softtabstop=0
+let b:undo_indent = 'setlocal autoindent< expandtab< softtabstop<'
diff --git a/vim/indent/tsv.vim b/vim/indent/tsv.vim
index 6f70276d..adbde97d 100644
--- a/vim/indent/tsv.vim
+++ b/vim/indent/tsv.vim
@@ -7,4 +7,5 @@ let b:did_indent = 1
" Manual indenting and literal tabs for TSVs
setlocal noautoindent
setlocal noexpandtab
-let b:undo_indent = 'setlocal autoindent< expandtab<'
+setlocal softtabstop=0
+let b:undo_indent = 'setlocal autoindent< expandtab< softtabstop<'