From 5933be35bac1f87fe9d6f576a0b6dd3d5be2394e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 17 Jan 2018 11:28:07 +1300 Subject: Clear unwanted syntax group, don't link to NONE --- vim/after/syntax/messages.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/after/syntax/messages.vim b/vim/after/syntax/messages.vim index a1f97d1f..04faa607 100644 --- a/vim/after/syntax/messages.vim +++ b/vim/after/syntax/messages.vim @@ -1,3 +1,3 @@ " The highlighting for errors in syslog/messages files is more often annoying " than useful, so just turn it off. -highlight! link messagesError NONE +syntax clear messagesError -- cgit v1.2.3 From 83ceb4f6f3d90ec00b4912ead29f427c62dbe5d9 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 17 Jan 2018 11:28:57 +1300 Subject: Remove HTML and PHP syntax highlighting tweaks The things they were intended to fix aren't actually that bad, on review. --- vim/after/syntax/html.vim | 3 --- vim/after/syntax/php.vim | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 vim/after/syntax/html.vim delete mode 100644 vim/after/syntax/php.vim diff --git a/vim/after/syntax/html.vim b/vim/after/syntax/html.vim deleted file mode 100644 index d476ec2c..00000000 --- a/vim/after/syntax/html.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Make HTML highlighting a bit less visually noisy -highlight! link htmlTag Type -highlight! link htmlEndTag htmlTag diff --git a/vim/after/syntax/php.vim b/vim/after/syntax/php.vim deleted file mode 100644 index 139e9d36..00000000 --- a/vim/after/syntax/php.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Make PHP highlighting a bit less visually noisy -highlight! link phpVarSelector phpIdentifier -- cgit v1.2.3 From d59dd741c1edc02543f5669eda866aa177289d6f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 17 Jan 2018 16:29:23 +1300 Subject: Refactor directory creation in plugins No functional changes here, just removing a little duplicate code. --- vim/plugin/auto_backupdir.vim | 8 ++++---- vim/plugin/auto_swapdir.vim | 8 ++++---- vim/plugin/auto_undodir.vim | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vim/plugin/auto_backupdir.vim b/vim/plugin/auto_backupdir.vim index 17a1a646..1535c486 100644 --- a/vim/plugin/auto_backupdir.vim +++ b/vim/plugin/auto_backupdir.vim @@ -34,12 +34,12 @@ if !isdirectory(expand(s:backupdir)) " (Fortunately, Unix and Windows are the only OS types in the world) elseif has('*shellescape') if has('unix') - silent! execute '!mkdir -m 0700 -p ' - \ . shellescape(expand(s:backupdir)) + let l:mkdir = '!mkdir -m 0700 -p ' elseif has('win32') || has('win64') - silent! execute '!mkdir ' - \ . shellescape(expand(s:backupdir)) + let l:mkdir = '!mkdir ' endif + silent! execute l:mkdir + \ . shellescape(expand(s:backupdir)) endif endif diff --git a/vim/plugin/auto_swapdir.vim b/vim/plugin/auto_swapdir.vim index 7d5940aa..2f9e6d25 100644 --- a/vim/plugin/auto_swapdir.vim +++ b/vim/plugin/auto_swapdir.vim @@ -34,12 +34,12 @@ if !isdirectory(expand(s:swapdir)) " (Fortunately, Unix and Windows are the only OS types in the world) elseif has('*shellescape') if has('unix') - silent! execute '!mkdir -m 0700 -p ' - \ . shellescape(expand(s:swapdir)) + let l:mkdir = '!mkdir -m 0700 -p ' elseif has('win32') || has('win64') - silent! execute '!mkdir ' - \ . shellescape(expand(s:swapdir)) + let l:mkdir = '!mkdir ' endif + silent! execute l:mkdir + \ . shellescape(expand(s:swapdir)) endif endif diff --git a/vim/plugin/auto_undodir.vim b/vim/plugin/auto_undodir.vim index 4382fe18..a38dce02 100644 --- a/vim/plugin/auto_undodir.vim +++ b/vim/plugin/auto_undodir.vim @@ -37,12 +37,12 @@ if !isdirectory(expand(s:undodir)) " (Fortunately, Unix and Windows are the only OS types in the world) elseif has('*shellescape') if has('unix') - silent! execute '!mkdir -m 0700 -p ' - \ . shellescape(expand(s:undodir)) + let l:mkdir = '!mkdir -m 0700 -p ' elseif has('win32') || has('win64') - silent! execute '!mkdir ' - \ . shellescape(expand(s:undodir)) + let l:mkdir = '!mkdir ' endif + silent! execute l:mkdir + \ . shellescape(expand(s:undodir)) endif endif -- cgit v1.2.3 From 5ff9286488eb3708d4ac646960fb8513d3c7a4e6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 18 Jan 2018 13:01:31 +1300 Subject: Always add --log to `git merge` --- git/gitconfig.mi5 | 1 + 1 file changed, 1 insertion(+) diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5 index 5a50c13c..3c97a77d 100644 --- a/git/gitconfig.mi5 +++ b/git/gitconfig.mi5 @@ -40,6 +40,7 @@ [merge] ff = false + log = true [pager] diff = cat -- cgit v1.2.3 From b4ff392e2acfae87179bdd504f4b972f2ff3b371 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 18 Jan 2018 13:05:21 +1300 Subject: Bump version number to 0.24.0 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 5320e1b1..55216e2f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v0.23.0 -Sun Jan 14 23:30:34 UTC 2018 +tejr dotfiles v0.24.0 +Thu Jan 18 00:04:53 UTC 2018 -- cgit v1.2.3