aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-18 13:05:39 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-18 13:05:39 +1300
commite2ef4845869aa38823542034473b5d6ce6ba2f3d (patch)
treedea5af9adf4481baf40c592cd0ce9da665b32960
parent99c655cd11cd9000a496bde9c9fced98308c6454 (diff)
parentb4ff392e2acfae87179bdd504f4b972f2ff3b371 (diff)
downloaddotfiles-0.24.0.tar.gz
Merge branch 'release/v0.24.0'v0.24.0
* release/v0.24.0: Bump version number to 0.24.0 Always add --log to `git merge` Refactor directory creation in plugins Remove HTML and PHP syntax highlighting tweaks Clear unwanted syntax group, don't link to NONE
-rw-r--r--VERSION4
-rw-r--r--git/gitconfig.mi51
-rw-r--r--vim/after/syntax/html.vim3
-rw-r--r--vim/after/syntax/messages.vim2
-rw-r--r--vim/after/syntax/php.vim2
-rw-r--r--vim/plugin/auto_backupdir.vim8
-rw-r--r--vim/plugin/auto_swapdir.vim8
-rw-r--r--vim/plugin/auto_undodir.vim8
8 files changed, 16 insertions, 20 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
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
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/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
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
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