From b9dd7a5a29cce071ca1bfdd14166774e72b127a3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 16 Feb 2018 22:58:17 +1300 Subject: Check for 'esckeys' option for NeoVim NeoVim v0.2.3-708-g77286915a no longer includes this option, and raises an error if I try to set it. --- vim/config/terminal.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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= " 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 -- cgit v1.2.3 From 4702e0a41d4a0f3b0c8d7a8b49732f04d772b37a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 17 Feb 2018 00:13:48 +1300 Subject: Remove 'smarttab' setting In practice, I don't actually use this; I do ^V^I, and I seldom need literal tabs anyway. Better to leave the behaviour predictable. --- vim/config/whitespace.vim | 4 ---- 1 file changed, 4 deletions(-) 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 -- cgit v1.2.3 From c44e0f30219fe8cdb9443931ddf05bdb2904846c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 17 Feb 2018 23:00:16 +1300 Subject: Turn off Vim 'softtabstop' for CSV and TSV files Otherwise entering a Tab in insert mode inserts four spaces. I'm not sure how I didn't notice this before. --- vim/indent/csv.vim | 3 ++- vim/indent/tsv.vim | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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<' -- cgit v1.2.3 From 2cc4c3bfc66bcfb128250f419ef17d00bae1b699 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 18 Feb 2018 17:15:01 +1300 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.3