aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ISSUES.md5
-rw-r--r--Makefile10
-rw-r--r--VERSION4
-rw-r--r--man/man1/edda.1df2
-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
8 files changed, 25 insertions, 6 deletions
diff --git a/ISSUES.md b/ISSUES.md
index 282d8cdc..3ead2d0d 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -21,3 +21,8 @@ Known issues
* Need to decide whether I care about XDG, and implement it if I do
* Need to decide whether I'm testing the shell snippets for MPD, Keychain etc,
and if so how.
+* The custom shell functions really should be documented, but it's not clear to
+ me exactly where this should happen, because the commands' availability
+ depends on which shell you're using; the `sd` function isn't available when
+ you're not using Bash. Maybe I should try to extend `help` without breaking
+ it?
diff --git a/Makefile b/Makefile
index 833f4ac9..ee6afcb3 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,7 @@
install-vim-gui-config \
install-vim-indent \
install-vim-plugin \
+ install-vim-syntax \
install-vint \
install-wget \
install-x \
@@ -506,7 +507,8 @@ install-vim: install-vim-after \
install-vim-ftdetect \
install-vim-ftplugin \
install-vim-indent \
- install-vim-plugin
+ install-vim-plugin \
+ install-vim-syntax
install-neovim:
make install-vim \
@@ -591,6 +593,10 @@ install-vim-plugin:
mkdir -p -- $(VIMDIR)/plugin
cp -p -- vim/plugin/*.vim $(VIMDIR)/plugin
+install-vim-syntax:
+ mkdir -p -- $(VIMDIR)/syntax
+ cp -p -- vim/syntax/*.vim $(VIMDIR)/syntax
+
install-vint:
cp -p -- vint/vintrc.yaml $(HOME)/.vintrc.yaml
@@ -600,7 +606,7 @@ install-wget:
install-x: check-xinit
mkdir -p -- \
$(HOME)/.config \
- $(HOME)/.config/sxhkdrc \
+ $(HOME)/.config/sxhkd \
$(HOME)/.xinitrc.d \
$(HOME)/.Xresources.d
cp -p -- X/redshift.conf $(HOME)/.config
diff --git a/VERSION b/VERSION
index 7529c85a..3e345d04 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.71.3
-Wed Oct 31 21:06:39 UTC 2018
+tejr dotfiles v1.72.0
+Wed Nov 21 09:57:27 UTC 2018
diff --git a/man/man1/edda.1df b/man/man1/edda.1df
index 0f968d8a..0daef171 100644
--- a/man/man1/edda.1df
+++ b/man/man1/edda.1df
@@ -20,7 +20,7 @@ each of the files given as arguments. Example:
.br
Let one know thy secret, but never a second;
.br
- If three, a thousand shall know."
+ If three, a thousand shall know.
.P
-- Poetic Edda, Hávamál, 63
.br
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>