aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION4
-rw-r--r--bin/han.bash1
-rw-r--r--bin/mked.sh1
-rw-r--r--bin/mkvi.sh1
-rw-r--r--bin/qat.sh1
-rw-r--r--vim/after/indent/vim.vim6
-rw-r--r--vim/autoload/indent.vim18
m---------vim/bundle/detect_indent0
8 files changed, 9 insertions, 23 deletions
diff --git a/VERSION b/VERSION
index 2bc5d6ad..aba6e008 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v10.14.0
-Wed, 11 Nov 2020 21:34:36 +0000
+tejr dotfiles v10.15.0
+Thu, 12 Nov 2020 11:15:17 +0000
diff --git a/bin/han.bash b/bin/han.bash
index 2cac9d4e..5e5d67c2 100644
--- a/bin/han.bash
+++ b/bin/han.bash
@@ -1,5 +1,4 @@
# Abstract calls to Bash help vs man(1)
-self=han
# Ensure we're using at least version 3.0
# shellcheck disable=SC2128
diff --git a/bin/mked.sh b/bin/mked.sh
index 93e21573..24a61de8 100644
--- a/bin/mked.sh
+++ b/bin/mked.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
# Create paths to all files before invoking editor
for file do
mkdir -p -- "${file%/*}" || exit
diff --git a/bin/mkvi.sh b/bin/mkvi.sh
index c5974383..ac5c6229 100644
--- a/bin/mkvi.sh
+++ b/bin/mkvi.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
# Create paths to all files before invoking editor
for file do
mkdir -p -- "${file%/*}" || exit
diff --git a/bin/qat.sh b/bin/qat.sh
index 31f5e8dd..19acbf5a 100644
--- a/bin/qat.sh
+++ b/bin/qat.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
restore() {
if [ -n "$stty" ] ; then
stty "$stty"
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index da34eb75..4300e125 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -1,9 +1,9 @@
-" Use two (not four!) spaces for indentation, per convention
-call indent#Spaces(2)
-
" Remove inapplicable defaults from 'indentkeys'; we should only need to undo
" this if the stock plugin didn't already arrange that (before v7.3.539)
setlocal indentkeys-=0#,0{,0},0),:
if !exists('b:undo_indent')
let b:undo_indent = 'setlocal indentkeys<'
endif
+
+" Use two (not four!) spaces for indentation, per convention
+call indent#Spaces(2)
diff --git a/vim/autoload/indent.vim b/vim/autoload/indent.vim
index 5f62fb0b..19a9f03d 100644
--- a/vim/autoload/indent.vim
+++ b/vim/autoload/indent.vim
@@ -19,27 +19,17 @@ endfunction
" Set the current buffer to tab indent
function! indent#Tabs() abort
- setlocal noexpandtab
- setlocal shiftwidth< softtabstop<
+ setlocal noexpandtab shiftwidth< softtabstop<
call indent#Undo()
endfunction
" Add commands to b:undo_indent to clean up buffer-local indentation changes
" on a change of filetype
function! indent#Undo() abort
-
- " Check and set a flag so that we only do this once per buffer
- if exists('b:undo_indent_type_set')
- return
- endif
- let b:undo_indent_type_set = 1
-
- " Either set or append relevant commands to b:undo_indent
- let l:undo = 'setlocal expandtab< shiftwidth< softtabstop< tabstop<'
+ let undo = 'setlocal expandtab< shiftwidth< softtabstop<'
if exists('b:undo_indent')
- let b:undo_indent .= '|'.l:undo
+ let b:undo_indent .= '|'.undo
else
- let b:undo_indent = l:undo
+ let b:undo_indent = undo
endif
-
endfunction
diff --git a/vim/bundle/detect_indent b/vim/bundle/detect_indent
-Subproject b41d085cdcaf1f957b2c219630f332023baba72
+Subproject 0c9aad7d707b3bdb4aabeeb0119953458e7efdb