aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-02 14:34:04 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-02 14:34:04 +1200
commit682897562b1a1efc1fd993f666a78d5957fc1533 (patch)
tree5581b01edbaa439bc93e57499302cec0dfabc42c
parentb6cfedbbf4e02e71fbd0e44a70a33227ce03c0ed (diff)
parentcf2ca490db72291662be6a7a7903e69d66342b53 (diff)
downloaddotfiles-682897562b1a1efc1fd993f666a78d5957fc1533.tar.gz
Merge branch 'release/v1.16.0'v1.16.0
* release/v1.16.0: Rebuild dotfiles(7) manual Bump VERSION Update insert_cancel.vim plugin Add vim config subfile to undo Debian's changes Provide install-neovim target Don't shout in CJK in README.md. Don't spellcheck &readonly text/markdown Add 'c' flag to 'formatoptions' for gitcommit Correct <C-L> mapping
-rw-r--r--Makefile6
-rw-r--r--README.md17
-rw-r--r--VERSION4
-rw-r--r--man/man7/dotfiles.7df20
-rw-r--r--vim/after/ftplugin/gitcommit.vim2
-rw-r--r--vim/after/ftplugin/markdown.vim10
-rw-r--r--vim/after/ftplugin/text.vim10
m---------vim/bundle/insert_cancel0
-rw-r--r--vim/config/debian.vim21
-rw-r--r--vim/vimrc3
10 files changed, 58 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 86b3942c..b42ee72c 100644
--- a/Makefile
+++ b/Makefile
@@ -430,6 +430,11 @@ install-ncmcpp: install-mpd
mkdir -p -- $(HOME)/.ncmpcpp
cp -p -- ncmpcpp/config $(HOME)/.ncmpcpp
+install-neovim:
+ make install-vim \
+ VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \
+ VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim
+
install-newsboat:
mkdir -p -- $(HOME)/.config/newsboat $(HOME)/.local/share/newsboat
cp -p -- newsboat/config $(HOME)/.config/newsboat
@@ -544,6 +549,7 @@ install-vim-compiler:
install-vim-config:
cp -p -- vim/vimrc $(VIMRC)
+ cp -p -- vim/config/*.vim $(VIMDIR)/config
install-vim-filetype:
cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
diff --git a/README.md b/README.md
index e8f6b2c1..85342e14 100644
--- a/README.md
+++ b/README.md
@@ -390,16 +390,13 @@ check of Perl scripts, and `_l` runs a Perl::Critic check.
#### Neovim
I test my configuration every now and then with the [Neovim
-fork](https://neovim.io/). To install the configuration where Neovim will use
-it, do this:
+fork](https://neovim.io/). There's an `install-neovim` target to run
+`install-vim` with the appropriate paths changed.
- $ nvd=${XDG_CONFIG_HOME:-"$HOME"/.config}/nvim
- $ make install-vim VIMRC="$nvd"/init.vim VIMDIR="$nvd"
-
-Neovim's [godless
-arrogance](https://twitter.com/tpope/status/437019518444240896)
-notwithstanding, I do rather like it overall, but I'm not presently using it as
-my daily driver and so it might balk at recent addenda to my configuration.
+Its [godless arrogance](https://twitter.com/tpope/status/437019518444240896)
+notwithstanding, I do rather like Neovim overall, but I'm not presently using
+it as my daily driver, and so it might balk at recent addenda to my
+configuration.
Scripts
-------
@@ -605,7 +602,7 @@ There's some silly stuff in `install-games`:
comic.
* `acq(6df)` allows you to interrogate AC, the interplanetary computer.
* `aesth(6df)` converts English letters to their full width CJK analogues,
- for AESTHETIC PURPOSES.
+ for aesthetic purposes.
* `squ(6df)` makes a reduced Latin square out of each line of input.
* `kvlt(6df)` translates input to emulate a style of typing unique to black
metal communities on the internet.
diff --git a/VERSION b/VERSION
index 949d3df7..cea611d2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.15.0
-Sun Jul 1 23:07:26 UTC 2018
+tejr dotfiles v1.16.0
+Mon Jul 2 02:33:32 UTC 2018
diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df
index af533838..f8f6a453 100644
--- a/man/man7/dotfiles.7df
+++ b/man/man7/dotfiles.7df
@@ -536,20 +536,14 @@ Perl scripts, and \f[C]_l\f[] runs a Perl::Critic check.
.PP
I test my configuration every now and then with the Neovim
fork (https://neovim.io/).
-To install the configuration where Neovim will use it, do this:
-.IP
-.nf
-\f[C]
-$\ nvd=${XDG_CONFIG_HOME:\-"$HOME"/.config}/nvim
-$\ make\ install\-vim\ VIMRC="$nvd"/init.vim\ VIMDIR="$nvd"
-\f[]
-.fi
+There's an \f[C]install\-neovim\f[] target to run \f[C]install\-vim\f[]
+with the appropriate paths changed.
.PP
-Neovim's godless
+Its godless
arrogance (https://twitter.com/tpope/status/437019518444240896)
-notwithstanding, I do rather like it overall, but I'm not presently
-using it as my daily driver and so it might balk at recent addenda to my
-configuration.
+notwithstanding, I do rather like Neovim overall, but I'm not presently
+using it as my daily driver, and so it might balk at recent addenda to
+my configuration.
.SS Scripts
.PP
Where practical, I make short scripts into POSIX (but not Bourne)
@@ -951,7 +945,7 @@ Farts (http://www.asciiartfarts.com/) comic.
computer.
.IP \[bu] 2
\f[C]aesth(6df)\f[] converts English letters to their full width CJK
-analogues, for AESTHETIC PURPOSES.
+analogues, for aesthetic purposes.
.IP \[bu] 2
\f[C]squ(6df)\f[] makes a reduced Latin square out of each line of
input.
diff --git a/vim/after/ftplugin/gitcommit.vim b/vim/after/ftplugin/gitcommit.vim
index 761ebc81..b7538c9c 100644
--- a/vim/after/ftplugin/gitcommit.vim
+++ b/vim/after/ftplugin/gitcommit.vim
@@ -14,6 +14,6 @@ let b:undo_ftplugin = b:undo_ftplugin
" Make angle brackets behave like mail quotes
setlocal comments+=n:>
-setlocal formatoptions+=or
+setlocal formatoptions+=cor
let b:undo_ftplugin = b:undo_ftplugin
\ . '|setlocal comments< formatoptions<'
diff --git a/vim/after/ftplugin/markdown.vim b/vim/after/ftplugin/markdown.vim
index 29d13c71..7ec37c64 100644
--- a/vim/after/ftplugin/markdown.vim
+++ b/vim/after/ftplugin/markdown.vim
@@ -12,7 +12,9 @@ let b:did_ftplugin_after = 1
let b:undo_ftplugin = b:undo_ftplugin
\ . '|unlet b:did_ftplugin_after'
-" Spellcheck documents
-setlocal spell
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|setlocal spell<'
+" Spellcheck documents we're actually editing (not just viewing)
+if !&readonly
+ setlocal spell
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|setlocal spell<'
+endif
diff --git a/vim/after/ftplugin/text.vim b/vim/after/ftplugin/text.vim
index cd35231e..06ca464a 100644
--- a/vim/after/ftplugin/text.vim
+++ b/vim/after/ftplugin/text.vim
@@ -12,7 +12,9 @@ let b:did_ftplugin_after = 1
let b:undo_ftplugin = b:undo_ftplugin
\ . '|unlet b:did_ftplugin_after'
-" Spellcheck documents
-setlocal spell
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|setlocal spell<'
+" Spellcheck documents we're actually editing (not just viewing)
+if !&readonly
+ setlocal spell
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|setlocal spell<'
+endif
diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel
-Subproject ec0551228a91752d2be5f9d771e2cb5a624e6ba
+Subproject a7aa9d44a7dc4f604c68a1b51eb66d6c4e2789a
diff --git a/vim/config/debian.vim b/vim/config/debian.vim
new file mode 100644
index 00000000..e50fc260
--- /dev/null
+++ b/vim/config/debian.vim
@@ -0,0 +1,21 @@
+" Revert settings that Debian might have touched
+if $VIM ==# '/usr/share/vim' && filereadable('/etc/debian_version')
+
+ " Set options back to appropriate defaults
+ set history&
+ set suffixes&
+ if has('cmdline_info')
+ set ruler&
+ endif
+ if has('printoptions')
+ set printoptions&
+ endif
+
+ " Restore terminal settings to reflect terminfo
+ set t_Co& t_Sf& t_Sb&
+
+ " Remove addons directories from 'runtimepath' if present
+ silent! set runtimepath-=/var/lib/vim/addons
+ silent! set runtimepath-=/var/lib/vim/addons/after
+
+endif
diff --git a/vim/vimrc b/vim/vimrc
index 15d86763..5b47d98f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -165,7 +165,8 @@ if has('windows')
endif
" Stack normal/visual/select Ctrl-L to clear search highlight
-noremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L>
+nnoremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L>
+vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L>
" Stack insert Ctrl-C to undo the escaped insert operation
" Default to not-quite-correct vim-tiny-compatible map if no plugin