From bff3a1edba6dff217e6b52fe8ee3fde53a078350 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 25 Jun 2018 22:16:54 +1200
Subject: Expand/fix messages filetype detection

---
 vim/filetype.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'vim')

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
-- 
cgit v1.2.3


From 63f7033045108f59ff9aa10bbeaba01200990375 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 25 Jun 2018 22:56:04 +1200
Subject: Add fallback for normal J

---
 vim/vimrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'vim')

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)
-- 
cgit v1.2.3