From ff5f3d55442d82381adbd98397724e5b04cfd9d7 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 14 Nov 2018 23:21:30 +1300
Subject: Add missing left angle bracket to filetype undo

---
 vim/ftplugin/tmux.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vim')

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<'
-- 
cgit v1.2.3


From c8d8ae55b98503bc0c95d5ad1809a93ab92494e9 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 16 Nov 2018 12:46:44 +1300
Subject: Add Bash settings to Vim readline highlighting

This includes the creation of a hitherto-unneeded Makefile target
install-vim-syntax.
---
 vim/after/syntax/readline.vim | 3 +++
 vim/syntax/readline.vim       | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 vim/after/syntax/readline.vim
 create mode 100644 vim/syntax/readline.vim

(limited to 'vim')

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/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
-- 
cgit v1.2.3


From a95245c9911a3836d5d0728d6079e4c79571c600 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 21 Nov 2018 22:55:43 +1300
Subject: Restore 'visualbell' Vim setting

Commit 35ba8df removed this, but the bell still rings on a TTY and in
an X terminal outside of tmux. I didn't notice because the machine I was
using doesn't have a PC speaker.
---
 vim/vimrc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'vim')

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>
-- 
cgit v1.2.3