diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-11-13 00:15:21 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-11-13 00:15:21 +1300 |
commit | 03a07b9e2e8785e518c533561725d79ebfc6dcbd (patch) | |
tree | f2bedb72ae8586d68e645684bce54a14cf69df01 | |
parent | Merge branch 'release/v10.14.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-03a07b9e2e8785e518c533561725d79ebfc6dcbd.tar.gz dotfiles-03a07b9e2e8785e518c533561725d79ebfc6dcbd.zip |
Merge branch 'release/v10.15.0'v10.15.0
* release/v10.15.0:
Update detect_indent.vim to v0.1.3
Work around b:undo_indent mis-setting for Vim
Remove unneeded local var prefixes
Condense a :set line
Remove unneeded load guard
Remove unneeded self var for han(1df)
Remove unneeded shebangs
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | bin/han.bash | 1 | ||||
-rw-r--r-- | bin/mked.sh | 1 | ||||
-rw-r--r-- | bin/mkvi.sh | 1 | ||||
-rw-r--r-- | bin/qat.sh | 1 | ||||
-rw-r--r-- | vim/after/indent/vim.vim | 6 | ||||
-rw-r--r-- | vim/autoload/indent.vim | 18 | ||||
m--------- | vim/bundle/detect_indent | 0 |
8 files changed, 9 insertions, 23 deletions
@@ -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 @@ -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 |