diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-26 19:20:22 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-26 19:20:22 +1200 |
commit | 7ebefe15c2765c5aaa7b01085506cfbbd98146d4 (patch) | |
tree | 5bdaf5a21635b39163f9eae86d720852bf8ec239 | |
parent | Merge branch 'release/v1.40.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-7ebefe15c2765c5aaa7b01085506cfbbd98146d4.tar.gz dotfiles-7ebefe15c2765c5aaa7b01085506cfbbd98146d4.zip |
Merge branch 'release/v1.41.0'v1.41.0
* release/v1.41.0:
Bump VERSION
Move NeoVim-specific config to subfile
Set 'noruler' in .vimrc
Set 'ttymouse' silently
Correct VIMRC path for NeoVim install target
Stamp down three new ShellCheck 0.5.0 errors
Update colon_operator.vim plugin
Remove & remaps
Spin quickfix_auto_open.vim out into a plugin
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | bash/bashrc.d/pushd.bash | 2 | ||||
-rw-r--r-- | bash/bashrc.d/vared.bash | 2 | ||||
-rw-r--r-- | ksh/shrc.d/ksh.sh | 1 | ||||
m--------- | vim/bundle/colon_operator | 0 | ||||
m--------- | vim/bundle/quickfix_auto_open | 0 | ||||
m--------- | vim/bundle/surround | 0 | ||||
-rw-r--r-- | vim/nvim.vim | 7 | ||||
-rw-r--r-- | vim/plugin/quickfix_auto_open.vim | 22 | ||||
-rw-r--r-- | vim/vimrc | 16 |
12 files changed, 24 insertions, 38 deletions
diff --git a/.gitmodules b/.gitmodules index 972ca896..46179fab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,6 +29,9 @@ [submodule "vim/bundle/put_blank_lines"] path = vim/bundle/put_blank_lines url = https://sanctum.geek.nz/code/vim-put-blank-lines.git +[submodule "vim/bundle/quickfix_auto_open"] + path = vim/bundle/quickfix_auto_open + url = https://sanctum.geek.nz/code/vim-quickfix-auto-open.git [submodule "vim/bundle/redact_pass"] path = vim/bundle/redact_pass url = https://sanctum.geek.nz/code/vim-redact-pass.git @@ -511,8 +511,9 @@ install-vim: install-vim-after \ install-neovim: make install-vim \ VIM=nvim \ - VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \ - VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim + VIMDIR="$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim" \ + VIMRC="$${XDG_CONFIG_HOME:="$$HOME"/.config}/nvim/init.vim" + cp -p -- vim/nvim.vim "$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim" install-vim-after: install-vim-after-ftplugin \ install-vim-after-indent \ @@ -1,2 +1,2 @@ -tejr dotfiles v1.40.0 -Tue Jul 24 03:12:33 UTC 2018 +tejr dotfiles v1.41.0 +Thu Jul 26 07:20:03 UTC 2018 diff --git a/bash/bashrc.d/pushd.bash b/bash/bashrc.d/pushd.bash index ec621037..4a6e4be3 100644 --- a/bash/bashrc.d/pushd.bash +++ b/bash/bashrc.d/pushd.bash @@ -1,4 +1,4 @@ # Make pushd default to $HOME if no arguments given, much like cd pushd() { - builtin pushd "${@:-"$HOME"}" + builtin pushd "${@:-"$HOME"}" || return } diff --git a/bash/bashrc.d/vared.bash b/bash/bashrc.d/vared.bash index 9159485b..e024f48a 100644 --- a/bash/bashrc.d/vared.bash +++ b/bash/bashrc.d/vared.bash @@ -25,6 +25,6 @@ vared() { fi local name for name ; do - IFS= read -e -i "${!name}" -p "${prompt:-"$name"=}" -r -- "$name" + IFS= read -e -i "${!name}" -p "${prompt:-"$name"=}" -r -- "${name?}" done } diff --git a/ksh/shrc.d/ksh.sh b/ksh/shrc.d/ksh.sh index b591f37c..cc6eeb32 100644 --- a/ksh/shrc.d/ksh.sh +++ b/ksh/shrc.d/ksh.sh @@ -21,6 +21,7 @@ if [ -z "$KSH_VERSION" ] ; then # Test whether we have content in the .sh.version variable. Suppress errors # and run it in a subshell to work around parsing error precedence. + # shellcheck disable=SC2234 ( test -n "${.sh.version}" ) 2>/dev/null || return # If that peculiarly named variable was set, then that's our KSH_VERSION diff --git a/vim/bundle/colon_operator b/vim/bundle/colon_operator -Subproject 5525627dd9727f2ee713e3a06145a145410bcd7 +Subproject f966411229eae27333166a2e13ff868f1bf2b70 diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open new file mode 160000 +Subproject a2eccef1861e2c0be988bc182d7b14be94ebc9e diff --git a/vim/bundle/surround b/vim/bundle/surround -Subproject aa1f120ad3a29c27cc41d581cda3751c59343cc +Subproject 597068870b8f093a8b2d11536c62ff31222ee8d diff --git a/vim/nvim.vim b/vim/nvim.vim new file mode 100644 index 00000000..3ad54f57 --- /dev/null +++ b/vim/nvim.vim @@ -0,0 +1,7 @@ +" Configuration specific to NeoVim + +" Don't show a statusline if there's only one window +set laststatus=1 + +" Disable command line display of file position +set noruler diff --git a/vim/plugin/quickfix_auto_open.vim b/vim/plugin/quickfix_auto_open.vim deleted file mode 100644 index e2f111fb..00000000 --- a/vim/plugin/quickfix_auto_open.vim +++ /dev/null @@ -1,22 +0,0 @@ -" -" quickfix_auto_open.vim: Always pop open the quickfix list or location list -" when they're changed. Dispassionately stolen from romainl's minivimrc. -" -" Author: Tom Ryder <tom@sanctum.geek.nz> -" License: Same as Vim itself -" -if exists('g:loaded_quickfix_auto_open') || &compatible - finish -endif -if !exists('##QuickfixCmdPost') || !exists('##VimEnter') - finish -endif -let g:loaded_quickfix_auto_open = 1 - -" Always pop open quickfix and location lists when changed -augroup quickfix_auto_open - autocmd! - autocmd QuickfixCmdPost [^l]* cwindow - autocmd QuickfixCmdPost l* lwindow - autocmd VimEnter * cwindow -augroup END @@ -98,9 +98,6 @@ set incsearch " Don't join lines with two spaces at the end of sentences set nojoinspaces -" Don't show a statusline if there's only one window -set laststatus=1 - " Don't redraw the screen during batch execution set lazyredraw @@ -138,7 +135,7 @@ set splitright set timeoutlen=3000 " No terminal mouse, even if we could -set ttymouse= +silent! set ttymouse= " Wildmenu settings; see also plugin/wildignore.vim set wildmenu " Use wildmenu @@ -189,12 +186,6 @@ imap <C-K><C-K> <Plug>(DigraphSearch) nnoremap <Space> <C-F> nnoremap <BS> <C-B> -" Remap normal/visual & to preserve substitution flags -nnoremap <silent> & :&&<CR> -if exists(':xnoremap') - xnoremap <silent> & :&&<CR> -endif - " Map g: as a 'colon operator' nmap g: <Plug>(ColonOperator) @@ -303,5 +294,10 @@ nnoremap <Bslash><Delete> :bdelete<CR> " \INS edits a new buffer nnoremap <Bslash><Insert> :<C-U>enew<CR> +" If we're running NeoVim, source some extra configuration +if has('nvim') + runtime nvim.vim +endif + " Source any .vim files from ~/.vim/config runtime! config/*.vim |