path: root/vim
diff options
authorTom Ryder <tom@sanctum.geek.nz>2018-06-26 09:27:24 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-26 09:27:24 +1200
commit764c5c260b114750fd157f3839e48ea2cb0aa677 (patch)
tree9bed6fbb2527487e476623c96af1198d59588038 /vim
parent62aaa4eb10340bd2597b35307abc978f20cefc9c (diff)
parent68d000febf35536a4f2a4ddd2002cf4a5dcd82f4 (diff)
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
Diffstat (limited to 'vim')
2 files changed, 4 insertions, 3 deletions
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
diff --git a/vim/vimrc b/vim/vimrc
index 12892474..2e90ecbe 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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)