aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-05 14:19:50 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-05 14:19:50 +1200
commit8db7c00cda17f2e74883a03dcbbc11eefc40a7f1 (patch)
tree07663ccda30d59bdfe130b39ce354bb32ae1d376
parentMerge branch 'release/v5.16.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-5.17.0.tar.gz (sig)
dotfiles-5.17.0.zip
Merge branch 'release/v5.17.0'v5.17.0
* release/v5.17.0: Quote a tag name Correct an idea Spellcheck mail Revert "Try doing without 'backspace' settings" Switch back to :lhelpgrep for help searches Update vim-quickfix-auto-open to v2.0.0 Inline 'wildignore' setting Supplant \\ mapping with lst change jump
-rw-r--r--IDEAS.md6
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/mail.vim6
m---------vim/bundle/quickfix_auto_open0
-rw-r--r--vim/vimrc49
5 files changed, 32 insertions, 33 deletions
diff --git a/IDEAS.md b/IDEAS.md
index 7f2c1eb4..7c42cc96 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -19,8 +19,8 @@ Ideas
* Write something like `hcat(1df)` or `tcat(1df)` that includes filename
headings for each concatenated file.
* I can probably get rid of all that nasty templated shell by writing something
- that wraps around `td(1df)` and generates shell script to run, and calls that
- via `eval`.
+ that wraps around `mktd(1df)` and generates shell script to run, and calls
+ that via `eval`.
* Ideally, the AWK and/or sed scripts in the bin and games directories should
be syntax-checked or linted. I could at least add some patient application of
appropriate `gawk --lint` calls for each of the .awk scripts.
@@ -32,4 +32,4 @@ Ideas
* Almost definitely going to want to try a runparts layout for Git hooks at
some point
* I'd like a Git hook that pre-fills out "Version X.Y.Z" if making an annotated
- tag named vX.Y.Z.
+ tag named `vX.Y.Z`.
diff --git a/VERSION b/VERSION
index 7d0295e8..76d6b286 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v5.16.0
-Mon Jun 3 20:21:33 UTC 2019
+tejr dotfiles v5.17.0
+Wed Jun 5 02:19:50 UTC 2019
diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index 937ee40c..e84702f0 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -78,6 +78,12 @@ if exists('loaded_squeeze_repeat_blanks')
endif
+" Spellcheck documents we're actually editing (not just viewing)
+if &modifiable && !&readonly
+ setlocal spell
+ let b:undo_ftplugin .= '|setlocal spell<'
+endif
+
" Stop here if the user doesn't want ftplugin mappings
if exists('no_plugin_maps') || exists('no_mail_maps')
finish
diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open
-Subproject 0b642ea72474f289ce463b2ddc3fdb104f0abdf
+Subproject 9a3808f3b217f9cfc95d93ec111d33a0c239e92
diff --git a/vim/vimrc b/vim/vimrc
index 05b3c7e5..a5abb0b7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,9 +16,10 @@ set shiftwidth=4 " Indent with four spaces
" negative value to do this if Vim new enough to support it
let &softtabstop = vimrc#Version('7.3.693') ? -1 : &shiftwidth
-" Allow me to backspace 'autoindent' spaces in insert mode, and back over the
-" end of lines I've inserted in this session
-set backspace=indent,eol
+" Let me backspace over pretty much anything
+set backspace+=eol " Line breaks
+set backspace+=indent " Spaces from 'autoindent'
+set backspace+=start " Before the start of current insertion
" Keep backup files in dedicated directory; add trailing double-slash to keep
" full path in name, if Vim is new enough to support that
@@ -188,26 +189,13 @@ set virtualedit+=block
set visualbell t_vb=
" Tab completion settings
-set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn
- \,*.a,*.adf,*.asc,*.au,*.aup,*.avi
- \,*.bin,*.bmp,*.bz2
- \,*.class
- \,*.db,*.dbm,*.djvu,*.docx
- \,*.exe
- \,*.filepart,*.flac
- \,*.gd2,*.gif,*.gifv,*.gmo,*.gpg,*.gz
- \,*.hdf
- \,*.ico,*.iso
- \,*.jar,*.jpeg,*.jpg
- \,*.m4a,*.mid,*.mp3,*.mp4
- \,*.o,*.odp,*.ods,*.odt,*.ogg,*.ogv,*.opus
- \,*.pbm,*.pdf,*.png,*.ppt,*.psd,*.pyc
- \,*.rar,*.rm
- \,*.s3m,*.sdbm,*.sqlite,*.swf,*.swp
- \,*.tar,*.tga,*.ttf
- \,*.wav,*.webm
- \,*.xbm,*.xcf,*.xls,*.xlsx,*.xpm,*.xz
- \,*.zip
+set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn,*.a,*.adf,*.asc,*.au,*.aup
+ \,*.avi,*.bin,*.bmp,*.bz2,*.class,*.db,*.dbm,*.djvu,*.docx,*.exe
+ \,*.filepart,*.flac,*.gd2,*.gif,*.gifv,*.gmo,*.gpg,*.gz,*.hdf,*.ico
+ \,*.iso,*.jar,*.jpeg,*.jpg,*.m4a,*.mid,*.mp3,*.mp4,*.o,*.odp,*.ods,*.odt
+ \,*.ogg,*.ogv,*.opus,*.pbm,*.pdf,*.png,*.ppt,*.psd,*.pyc,*.rar,*.rm
+ \,*.s3m,*.sdbm,*.sqlite,*.swf,*.swp,*.tar,*.tga,*.ttf,*.wav,*.webm,*.xbm
+ \,*.xcf,*.xls,*.xlsx,*.xpm,*.xz,*.zip
if exists('+wildignorecase')
set wildignorecase " Case insensitive, if supported (v7.3.072)
endif
@@ -431,12 +419,17 @@ sunmap <Leader>}
" \/ types :vimgrep for me ready to enter a search pattern
nnoremap <Leader>/ :<C-U>vimgrep /\c/j **<S-Left><S-Left><Right>
-" \? types :helpgrep for me ready to enter a search pattern
-nnoremap <Leader>? :<C-U>helpgrep \c<S-Left>
+" \? types :lhelpgrep for me ready to enter a search pattern
+nnoremap <Leader>? :<C-U>lhelpgrep \c<S-Left>
-" \\ escapes regex metacharacters
-nmap <Leader>\ <Plug>(RegexEscape)
-xmap <Leader>\ <Plug>(RegexEscape)
+" \* escapes regex metacharacters
+nmap <Leader>* <Plug>(RegexEscape)
+xmap <Leader>* <Plug>(RegexEscape)
+
+" \\ jumps to the last edit position mark, like g;, but works as a motion
+" "Now, where was I?" (tap-tap)
+nmap <Leader>\ `"
+xmap <Leader>\ `"
" \DEL deletes the current buffer
nnoremap <Leader><Delete> :bdelete<CR>