aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-20 17:01:08 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-20 17:01:08 +1200
commit51d00a34c1d094bd9c94b065b08f2aa22e1ad8a1 (patch)
tree2a18a6252d181697691d52b2f7398be775ea30dc
parentMerge branch 'release/v4.33.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-51d00a34c1d094bd9c94b065b08f2aa22e1ad8a1.tar.gz
dotfiles-51d00a34c1d094bd9c94b065b08f2aa22e1ad8a1.zip
Merge branch 'release/v4.34.0'v4.34.0
* release/v4.34.0: Bump VERSION Use nicer patch-checking syntax Revert "Follow the manual's instructions for 't... Follow the manual's instructions for 'ttymouse' Remove a redundant sentence Start spell-checking HTML Don't bother checking for the 'spell' feature Add a spelling abbreviation Add an idea Add an idea Add mapping to create path for current file
-rw-r--r--IDEAS.md6
-rw-r--r--README.md3
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/html.vim6
-rw-r--r--vim/after/ftplugin/markdown.vim25
-rw-r--r--vim/after/ftplugin/sh.vim4
-rw-r--r--vim/vimrc14
7 files changed, 34 insertions, 28 deletions
diff --git a/IDEAS.md b/IDEAS.md
index 38ea9d47..146f7b95 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -26,3 +26,9 @@ Ideas
appropriate `gawk --lint` calls for each of the .awk scripts.
* Alternate buffer type switching would probably work rather well as a simple
plugin.
+* Write my own take on a plugin that creates paths if they don't exist before
+ saving a file. I already have \P, but it might be nice to automate it, maybe
+ with a prompt for security raisins.
+* Write a ftplugin for Perl to switch between punctuation variable names and
+ English variable names., i.e. \e on `$?` would change to `$CHILD_ERROR`, and
+ vice-versa.
diff --git a/README.md b/README.md
index ffaa23db..8599b04c 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,7 @@ directory so you can explore:
$ env -i HOME="$tmpdir" TERM="$TERM" "$SHELL" -l
The default `install` target will install these targets and all their
-dependencies. Note that you don't actually have to have any of this except
-`sh` installed.
+dependencies:
* `install-bin`
* `install-bin-man`
diff --git a/VERSION b/VERSION
index 71330ff8..c20057e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.33.0
-Sun May 19 02:39:54 UTC 2019
+tejr dotfiles v4.34.0
+Mon May 20 05:01:08 UTC 2019
diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index 203e3f46..8b390528 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -3,6 +3,12 @@ if &filetype !=# 'html'
finish
endif
+" Spellcheck documents we're actually editing (not just viewing)
+if &modifiable && !&readonly
+ setlocal spell
+ let b:undo_ftplugin .= '|setlocal spell<'
+endif
+
" Use tidy(1) for checking
compiler tidy
let b:undo_ftplugin .= '|unlet b:current_compiler'
diff --git a/vim/after/ftplugin/markdown.vim b/vim/after/ftplugin/markdown.vim
index b5919b20..7189a09a 100644
--- a/vim/after/ftplugin/markdown.vim
+++ b/vim/after/ftplugin/markdown.vim
@@ -1,19 +1,14 @@
-" Spellchecking features
-if has('spell')
-
- " Spellcheck documents we're actually editing (not just viewing)
- if &modifiable && !&readonly
- setlocal spell
- let b:undo_ftplugin .= '|setlocal spell<'
- endif
-
- " Tolerate leading lowercase letters in README.md files, for things like
- " headings being filenames
- if expand('%:t') ==# 'README.md'
- setlocal spellcapcheck=
- let b:undo_ftplugin .= '|setlocal spellcapcheck<'
- endif
+" Spellcheck documents we're actually editing (not just viewing)
+if &modifiable && !&readonly
+ setlocal spell
+ let b:undo_ftplugin .= '|setlocal spell<'
+endif
+" Tolerate leading lowercase letters in README.md files, for things like
+" headings being filenames
+if expand('%:t') ==# 'README.md'
+ setlocal spellcapcheck=
+ let b:undo_ftplugin .= '|setlocal spellcapcheck<'
endif
" Stop here if the user doesn't want ftplugin mappings
diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim
index e7bd21dc..9afd5086 100644
--- a/vim/after/ftplugin/sh.vim
+++ b/vim/after/ftplugin/sh.vim
@@ -23,9 +23,7 @@ let b:undo_ftplugin .= '|unlet b:current_compiler b:sh_check_compiler'
" Resort to g:is_posix for correct syntax on older runtime files
" 8.1.257 updated the runtime files to include a fix for this
-if exists('b:is_posix')
- \ && (v:version < 800
- \ || v:version == 800 && !has('patch257'))
+if exists('b:is_posix') && !has('patch-8.0.257')
let is_posix = 1
endif
diff --git a/vim/vimrc b/vim/vimrc
index 136c775a..7932e1de 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,8 +31,7 @@ endif
" Try to keep backups in one system-appropriate directory, including full
" encoded path in filename (trailing double slash) if supported (v8.1.251)
set backup
-if v:version > 801
- \ || v:version == 801 && has('patch251')
+if has('patch-8.1.251')
set backupdir^=$MYVIMRUNTIME/cache/backup//
else
set backupdir^=$MYVIMRUNTIME/cache/backup
@@ -92,8 +91,7 @@ if v:version > 703
endif
" Don't break a single space after a period, if supported (v8.1.728)
-if v:version > 801
- \ || v:version == 801 && has('patch728')
+if has('patch-8.1.728')
set formatoptions+=p
endif
@@ -175,8 +173,8 @@ if &term =~# '^putty'
set ttyfast
endif
-" No terminal mouse, even if we could; the manual says to set 't_RV', but I
-" don't like that
+" No terminal mouse, even if we could; the manual says to set 't_RV', but that
+" doesn't seem to work
" Not in NeoVim
if exists('+ttymouse') && &ttymouse !=# ''
set ttymouse=
@@ -360,6 +358,9 @@ nmap <Leader>O <Plug>(PasteOpenAbove)
" \p toggles paste mode
nnoremap <Leader>p :<C-U>set paste! paste?<CR>
+" \P creates the path to the current file
+nnoremap <Leader>P :<C-U>call mkdir(expand('%:h'), 'p')<CR>
+
" \q formats the current paragraph
nnoremap <Leader>q gqap
@@ -459,6 +460,7 @@ nnoremap <Leader>! ^"zyg_:!<C-R>z<CR>
" Things I almsot always type wrnog
inoreabbrev almsot almost
inoreabbrev wrnog wrong
+inoreabbrev Fielding Feilding
" Source any .vim files from ~/.vim/config
runtime! config/*.vim