aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-03 13:55:24 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-03 13:55:24 +1200
commit7771beeedf282be83389e671a053e4c371d90fe4 (patch)
treea4acf68878770f558b257796b344b9a6a62aabf8
parent8ecf9dfad5e56b6d67f955d363a5a07ac69bfbc1 (diff)
parentfe15bab548a10dc8d1395e23927f775b11cc1cc2 (diff)
downloaddotfiles-1.19.0.tar.gz
Merge branch 'release/v1.19.0'v1.19.0
* release/v1.19.0: Bump VERSION Convert space indents to tabs in Makefile Handle system-specific undos with system.vim file
-rw-r--r--Makefile16
-rw-r--r--VERSION4
-rw-r--r--vim/system/centos.vim (renamed from vim/config/centos.vim)0
-rw-r--r--vim/system/debian.vim (renamed from vim/config/debian.vim)0
-rw-r--r--vim/vimrc3
5 files changed, 12 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index e864a7ad..03f2740b 100644
--- a/Makefile
+++ b/Makefile
@@ -432,8 +432,8 @@ install-ncmcpp: install-mpd
install-neovim:
make install-vim \
- VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \
- VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim
+ VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \
+ VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim
install-newsboat:
mkdir -p -- $(HOME)/.config/newsboat $(HOME)/.local/share/newsboat
@@ -536,7 +536,7 @@ install-vim-autoload:
install-vim-bundle: install-vim-config
find vim/bundle/*/* \
- -type d -exec sh -c \
+ -type d -exec sh -c \
'mkdir -p -- $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \;
find vim/bundle/*/*/* \
-type f -exec sh -c \
@@ -548,14 +548,12 @@ install-vim-compiler:
cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
install-vim-config:
- mkdir -p -- $(VIMDIR)/config
cp -p -- vim/vimrc $(VIMRC)
if [ -e /etc/debian_version ] ; then \
- cp -p -- vim/config/debian.vim $(VIMDIR)/config ; \
- fi
- if [ -e /etc/centos-release ] ; then \
- cp -p -- vim/config/centos.vim $(VIMDIR)/config ; \
- fi
+ cp -p -- vim/system/debian.vim $(VIMDIR)/system.vim ; \
+ elif [ -e /etc/centos-release ] ; then \
+ cp -p -- vim/system/centos.vim $(VIMDIR)/system.vim ; \
+ fi
install-vim-filetype:
cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
diff --git a/VERSION b/VERSION
index 4c010c6f..04165f64 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.18.0
-Mon Jul 2 10:53:44 UTC 2018
+tejr dotfiles v1.19.0
+Tue Jul 3 01:53:55 UTC 2018
diff --git a/vim/config/centos.vim b/vim/system/centos.vim
index 26289bf8..26289bf8 100644
--- a/vim/config/centos.vim
+++ b/vim/system/centos.vim
diff --git a/vim/config/debian.vim b/vim/system/debian.vim
index 125a9240..125a9240 100644
--- a/vim/config/debian.vim
+++ b/vim/system/debian.vim
diff --git a/vim/vimrc b/vim/vimrc
index 5f3e06cf..b1fbbbd4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -4,6 +4,9 @@
" own without the accompanying plugins to which it refers near its end, but
" you'll get errors for some of the leader maps.
+" Undo anything the operating system's vimrc may have broken
+runtime system.vim
+
" Load filetype settings, plugins, and maps
if has('autocmd')
let g:maplocalleader = '_'