diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-26 09:27:24 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-26 09:27:24 +1200 |
commit | 764c5c260b114750fd157f3839e48ea2cb0aa677 (patch) | |
tree | 9bed6fbb2527487e476623c96af1198d59588038 | |
parent | Merge branch 'release/v1.4.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-764c5c260b114750fd157f3839e48ea2cb0aa677.tar.gz dotfiles-764c5c260b114750fd157f3839e48ea2cb0aa677.zip |
Merge branch 'release/v1.5.0'v1.5.0
* release/v1.5.0:
Bump VERSION
Add fallback for normal J
Expand/fix messages filetype detection
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/filetype.vim | 4 | ||||
-rw-r--r-- | vim/vimrc | 3 |
3 files changed, 6 insertions, 5 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v1.4.0 -Mon Jun 25 08:40:45 UTC 2018 +tejr dotfiles v1.5.0 +Mon Jun 25 21:27:11 UTC 2018 diff --git a/vim/filetype.vim b/vim/filetype.vim index d5c9bdb8..69847ba7 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -488,8 +488,8 @@ augroup filetypedetect \ setfiletype config autocmd BufNewFile,BufRead \ */log/* - \,*.log - \ setf messages + \,?*.log + \ setfiletype messages " Clumsy attempt at typing files in `sudo -e` if a filename hasn't already " been found; strip temporary extension and re-run @@ -200,7 +200,8 @@ nnoremap ]t :<C-U>tabnext<CR> nmap [<Space> <Plug>PutBlankLinesAbove nmap ]<Space> <Plug>PutBlankLinesBelow -" Remap normal J to hold the cursor still while joining lines +" Remap normal J to stay in place while joining lines; fall back to default +nnoremap <Plug>FixedJoin J nmap J <Plug>FixedJoin " Remap normal Y to yank to end of line (consistent with C, D) |