diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-18 21:59:35 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-18 21:59:35 +1200 |
commit | f8a1abc12fcc6e80d1dbe052988f91c272e0337c (patch) | |
tree | 77f9103831441da66f2d5a56512db0d364838ef1 | |
parent | Merge branch 'release/v6.28.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-6.29.0.tar.gz (sig) dotfiles-6.29.0.zip |
Merge branch 'release/v6.29.0'v6.29.0
* release/v6.29.0:
Stop down a Perl::Critic policy I dislike
Swap two terms
Adjust paste_insert.vim to :set paste pre-insert
Extend default 'encoding' check in vimrc
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | perlcritic/perlcriticrc | 3 | ||||
-rw-r--r-- | vim/autoload/paste_insert.vim | 4 | ||||
-rw-r--r-- | vim/vimrc | 5 |
4 files changed, 10 insertions, 6 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v6.28.0 -Tue, 18 Jun 2019 05:11:40 +0000 +tejr dotfiles v6.29.0 +Tue, 18 Jun 2019 09:59:35 +0000 diff --git a/perlcritic/perlcriticrc b/perlcritic/perlcriticrc index a3517cc8..0bd59c98 100644 --- a/perlcritic/perlcriticrc +++ b/perlcritic/perlcriticrc @@ -25,3 +25,6 @@ add_exceptions = inet4 inet6 ipv4 ipv6 # milliseconds etc), 60 (for angles and clocks), and 1900 (for localtime) [ValuesAndExpressions::ProhibitMagicNumbers] allowed_values = -1 0..9 10 60 100 1000 1900 + +# There's nothing wrong with $x == 2, and 2 == $x is just weird +[-ValuesAndExpressions::RequireConstantOnLeftSideOfEquality] diff --git a/vim/autoload/paste_insert.vim b/vim/autoload/paste_insert.vim index ada11456..675fa5ab 100644 --- a/vim/autoload/paste_insert.vim +++ b/vim/autoload/paste_insert.vim @@ -5,8 +5,8 @@ function! paste_insert#() abort \ set nopaste paste? \|autocmd! paste_insert autocmd InsertEnter * - \ set paste paste? - \|autocmd paste_insert InsertLeave * + \ autocmd paste_insert InsertLeave * \ doautocmd paste_insert User augroup END + set paste paste? endfunction @@ -41,9 +41,10 @@ " to a multibyte (UTF-8) locale. This informs Vim's choice of internal " character encoding, but the default for the 'encoding' option in LANG's " absence is "latin1". Nowadays, this is never what I want, so we'll manually -" choose "utf-8" as an encoding instead if LANG is not defined. +" choose "utf-8" as an encoding instead if the encoding is the default +" 'latin1', and LANG is not defined. " -if !exists('$LANG') +if !exists('$LANG') && &encoding ==# 'latin1' set encoding=utf-8 endif scriptencoding utf-8 |