aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-21 22:57:28 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-21 22:57:28 +1300
commitf4ce398f35874c86b8820937527eb065af745f9b (patch)
treec2b3cfccff940ce12eed75529831d720d27c90e7 /vim
parentMerge branch 'hotfix/v1.71.3' (diff)
parentBump VERSION (diff)
downloaddotfiles-1.72.0.tar.gz (sig)
dotfiles-1.72.0.zip
Merge branch 'release/v1.72.0'v1.72.0
* release/v1.72.0: Bump VERSION Restore 'visualbell' Vim setting Correct sxhkd installation path Add Bash settings to Vim readline highlighting Add missing left angle bracket to filetype undo Remove trailing quote from edda(1df) manual Add a new issue
Diffstat (limited to 'vim')
-rw-r--r--vim/after/syntax/readline.vim3
-rw-r--r--vim/ftplugin/tmux.vim2
-rw-r--r--vim/syntax/readline.vim2
-rw-r--r--vim/vimrc3
4 files changed, 9 insertions, 1 deletions
diff --git a/vim/after/syntax/readline.vim b/vim/after/syntax/readline.vim
new file mode 100644
index 00000000..050b2dc1
--- /dev/null
+++ b/vim/after/syntax/readline.vim
@@ -0,0 +1,3 @@
+" Clear away the flag we set in syntax/readline.vim to include Bash commands
+" in the highlight list
+unlet! g:readline_has_bash
diff --git a/vim/ftplugin/tmux.vim b/vim/ftplugin/tmux.vim
index ecbd3e85..350bc976 100644
--- a/vim/ftplugin/tmux.vim
+++ b/vim/ftplugin/tmux.vim
@@ -6,4 +6,4 @@ endif
" Set comment formats
setlocal comments=:#
setlocal formatoptions+=or
-let b:undo_ftplugin = 'setlocal comments< formatoptions'
+let b:undo_ftplugin = 'setlocal comments< formatoptions<'
diff --git a/vim/syntax/readline.vim b/vim/syntax/readline.vim
new file mode 100644
index 00000000..874ebb32
--- /dev/null
+++ b/vim/syntax/readline.vim
@@ -0,0 +1,2 @@
+" Include Bash commands in the highlight list
+let g:readline_has_bash = 1
diff --git a/vim/vimrc b/vim/vimrc
index d017dfe9..03844def 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -215,6 +215,9 @@ if exists('+virtualedit')
set virtualedit+=block
endif
+" Never beep at me
+set visualbell t_vb=
+
" Stack normal/visual/select Ctrl-L to clear search highlight
nnoremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L>
vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L>