aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-24 10:16:49 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-24 10:16:49 +1200
commit55ecef2e56b364cb3cb04f90566c07ebbfbf72af (patch)
treec29023d3fbe8dcc0e9de9cd25dd21fab68bd09fe
parent25989141c2ec675ce4b63fff6025776596c1ff5b (diff)
parent72f8b9620ddd683dd406185a8c81c2c0edeba4cb (diff)
downloaddotfiles-55ecef2e56b364cb3cb04f90566c07ebbfbf72af.tar.gz
Merge branch 'release/v4.43.0'v4.43.0
* release/v4.43.0: Bump VERSION Remove ~/.vim/config sourcing Allow 60 as magic number in Perl::Critic
-rw-r--r--VERSION4
-rw-r--r--perlcritic/perlcriticrc4
-rw-r--r--vim/vimrc3
3 files changed, 4 insertions, 7 deletions
diff --git a/VERSION b/VERSION
index 0c266a02..ebb75883 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.42.0
-Thu May 23 02:57:52 UTC 2019
+tejr dotfiles v4.43.0
+Thu May 23 22:16:48 UTC 2019
diff --git a/perlcritic/perlcriticrc b/perlcritic/perlcriticrc
index 91bc1540..742c2239 100644
--- a/perlcritic/perlcriticrc
+++ b/perlcritic/perlcriticrc
@@ -19,6 +19,6 @@ add_exceptions = inet4 inet6 ipv4 ipv6
# Soften this rather harsh policy a fair bit; tolerate negative one, all the
# single-digit integers as literals, three powers of 10 (for percentages,
-# milliseconds etc), and 1900 (for localtime)
+# milliseconds etc), 60 (for angles and clocks), and 1900 (for localtime)
[ValuesAndExpressions::ProhibitMagicNumbers]
-allowed_values = -1 0..9 10 100 1000 1900
+allowed_values = -1 0..9 10 60 100 1000 1900
diff --git a/vim/vimrc b/vim/vimrc
index 5f860405..0456679f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -464,6 +464,3 @@ nnoremap <Leader>! ^"zyg_:!<C-R>z<CR>
inoreabbrev almsot almost
inoreabbrev wrnog wrong
inoreabbrev Fielding Feilding
-
-" Source any .vim files from ~/.vim/config
-runtime! config/*.vim