aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION4
-rw-r--r--terminfo/putty-256color.ti7
-rw-r--r--terminfo/putty.ti8
-rw-r--r--terminfo/rxvt-256color.ti4
-rw-r--r--terminfo/rxvt.ti5
-rw-r--r--terminfo/screen-256color.ti7
-rw-r--r--terminfo/screen.ti8
-rw-r--r--terminfo/tmux-256color.ti6
-rw-r--r--terminfo/tmux.ti7
-rw-r--r--vim/filetype.vim4
-rw-r--r--vim/vimrc113
11 files changed, 116 insertions, 57 deletions
diff --git a/VERSION b/VERSION
index 6ee3aa02..90623b2c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.29.0
-Tue, 18 Jun 2019 09:59:35 +0000
+tejr dotfiles v6.30.0
+Tue, 18 Jun 2019 20:33:51 +0000
diff --git a/terminfo/putty-256color.ti b/terminfo/putty-256color.ti
new file mode 100644
index 00000000..81d2b3f1
--- /dev/null
+++ b/terminfo/putty-256color.ti
@@ -0,0 +1,7 @@
+putty-256color| PuTTY with 256 colors,
+ use=putty,
+ colors#256,
+ initc@,
+ pairs#32767,
+ setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+ setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/terminfo/putty.ti b/terminfo/putty.ti
index 3f2ab27f..6c3bd69e 100644
--- a/terminfo/putty.ti
+++ b/terminfo/putty.ti
@@ -126,11 +126,3 @@ putty| PuTTY,
vpa=\E[%i%p1%dd,
xenl,
xon,
-
-putty-256color| PuTTY with 256 colors,
- use=putty,
- colors#256,
- initc@,
- pairs#32767,
- setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
- setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/terminfo/rxvt-256color.ti b/terminfo/rxvt-256color.ti
new file mode 100644
index 00000000..62e6c021
--- /dev/null
+++ b/terminfo/rxvt-256color.ti
@@ -0,0 +1,4 @@
+rxvt-unicode-256color| rxvt-unicode with 256 colors,
+ use=rxvt-unicode,
+ colors#256,
+ pairs#32767,
diff --git a/terminfo/rxvt.ti b/terminfo/rxvt.ti
index 735c7ef7..7f60d8ad 100644
--- a/terminfo/rxvt.ti
+++ b/terminfo/rxvt.ti
@@ -319,8 +319,3 @@ rxvt-unicode| rxvt-unicode,
vpa=\E[%i%p1%dd,
xenl,
xon,
-
-rxvt-unicode-256color| rxvt-unicode with 256 colors,
- use=rxvt-unicode,
- colors#256,
- pairs#32767,
diff --git a/terminfo/screen-256color.ti b/terminfo/screen-256color.ti
new file mode 100644
index 00000000..1cfabaf9
--- /dev/null
+++ b/terminfo/screen-256color.ti
@@ -0,0 +1,7 @@
+screen-256color| GNU Screen or tmux with 256 colors,
+ use=screen,
+ colors#256,
+ initc@,
+ pairs#32767,
+ setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+ setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/terminfo/screen.ti b/terminfo/screen.ti
index 574e78e0..3f51e9fd 100644
--- a/terminfo/screen.ti
+++ b/terminfo/screen.ti
@@ -98,11 +98,3 @@ screen| GNU Screen or tmux,
smul=\E[4m,
tbc=\E[3g,
xenl,
-
-screen-256color| GNU Screen or tmux with 256 colors,
- use=screen,
- colors#256,
- initc@,
- pairs#32767,
- setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
- setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/terminfo/tmux-256color.ti b/terminfo/tmux-256color.ti
new file mode 100644
index 00000000..a242b7c1
--- /dev/null
+++ b/terminfo/tmux-256color.ti
@@ -0,0 +1,6 @@
+tmux-256color| tmux with 256 colors,
+ use=tmux,
+ colors#256,
+ pairs#32767,
+ setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+ setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/terminfo/tmux.ti b/terminfo/tmux.ti
index 7d430322..fc86d773 100644
--- a/terminfo/tmux.ti
+++ b/terminfo/tmux.ti
@@ -102,10 +102,3 @@ tmux| tmux terminal multiplexer,
tbc=\E[3g,
tsl=\E]0;,
xenl,
-
-tmux-256color| tmux with 256 colors,
- use=tmux,
- colors#256,
- pairs#32767,
- setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
- setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 19f65e23..e65848bb 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -72,9 +72,11 @@ augroup filetypedetect
\,?*.patch
\,?*.rej
\ setfiletype diff
- " INI files
+ " INI format files
autocmd BufNewFile,BufRead
\ ?*.ini
+ \,perlcriticrc
+ \,.perlcriticrc
\ setfiletype dosini
" DOT graphs
autocmd BufNewFile,BufRead
diff --git a/vim/vimrc b/vim/vimrc
index 50f19a1f..2f638b6b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -102,12 +102,11 @@ scriptencoding utf-8
" I'll factor all of this mess out into a global function if I ever need it
" anywhere else. Vim, I love you, but you are really weird.
"
-let s:runtimepath = map(
- \ split(&runtimepath, '\\\@<!,[, ]*')
- \,'substitute(v:val, ''\\,'', '''', ''g'')'
- \)
if !exists('$MYVIM')
- let $MYVIM = s:runtimepath[0]
+ let $MYVIM = map(
+ \ split(&runtimepath, '\\\@<!,[, ]*')
+ \,'substitute(v:val, ''\\,'', '''', ''g'')'
+ \)[0]
endif
" Having either imported or defined a value for the MYVIM environment
@@ -131,7 +130,7 @@ endif
" :execute abstraction, but it's not really worth the extra complexity for
" such a niche situation.
"
-if stridx($MYVIM, ',') != -1
+if stridx($MYVIM, ',') >= 0
echoerr 'Illegal comma in user runtime path'
finish
endif
@@ -150,7 +149,7 @@ endif
"
" <https://github.com/vim/vim/releases/tag/v7.1.055>
"
-if stridx($MYVIM, '\') != -1
+if stridx($MYVIM, '\') >= 0
\ && (v:version < 701 || v:version == 701 && !has('patch55'))
echoerr 'Illegal backslash in user runtime path on Vim < v7.1.055'
finish
@@ -508,8 +507,7 @@ set shiftwidth=4 " Indent command like < and > use four-space indents
"
" <https://github.com/vim/vim/releases/tag/v7.3.693>
"
-if v:version > 730
- \ || v:version == 730 && has('patch693')
+if v:version > 730 || v:version == 730 && has('patch693')
set softtabstop=-1
else
let &softtabstop = &shiftwidth
@@ -639,8 +637,7 @@ set formatoptions+=1
"
" <https://github.com/vim/vim/releases/tag/v7.3.541>
"
-if v:version > 730
- \ || v:version == 730 && has('patch541')
+if v:version > 730 || v:version == 730 && has('patch541')
set formatoptions+=j
endif
@@ -933,18 +930,77 @@ set wildmode=list:longest,full
"
" <https://mywiki.wooledge.org/UsingFind#Complex_actions>
"
-" It's tempting to put the list of patterns here into a separate file--or at
-" least into a more readily editable intermediate list variable--rather than
-" the minor maintenance hassle it presently constitutes in this compact form.
-" I'm not sure whether I'll do that just yet.
-"
-set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn,*.a,*.adf,*.asc,*.au,*.aup
- \,*.avi,*.bin,*.bmp,*.bz2,*.class,*.db,*.dbm,*.djvu,*.docx,*.exe
- \,*.filepart,*.flac,*.gd2,*.gif,*.gifv,*.gmo,*.gpg,*.gz,*.hdf,*.ico
- \,*.iso,*.jar,*.jpeg,*.jpg,*.m4a,*.mid,*.mp3,*.mp4,*.o,*.odp,*.ods,*.odt
- \,*.ogg,*.ogv,*.opus,*.pbm,*.pdf,*.png,*.ppt,*.psd,*.pyc,*.rar,*.rm
- \,*.s3m,*.sdbm,*.sqlite,*.swf,*.swp,*.tar,*.tga,*.ttf,*.wav,*.webm,*.xbm
- \,*.xcf,*.xls,*.xlsx,*.xpm,*.xz,*.zip
+set wildignore=*~,#*#
+ \,*.7z
+ \,.DS_Store
+ \,.git
+ \,.hg
+ \,.svn
+ \,*.a
+ \,*.adf
+ \,*.asc
+ \,*.au
+ \,*.aup
+ \,*.avi
+ \,*.bin
+ \,*.bmp
+ \,*.bz2
+ \,*.class
+ \,*.db
+ \,*.dbm
+ \,*.djvu
+ \,*.docx
+ \,*.exe
+ \,*.filepart
+ \,*.flac
+ \,*.gd2
+ \,*.gif
+ \,*.gifv
+ \,*.gmo
+ \,*.gpg
+ \,*.gz
+ \,*.hdf
+ \,*.ico
+ \,*.iso
+ \,*.jar
+ \,*.jpeg
+ \,*.jpg
+ \,*.m4a
+ \,*.mid
+ \,*.mp3
+ \,*.mp4
+ \,*.o
+ \,*.odp
+ \,*.ods
+ \,*.odt
+ \,*.ogg
+ \,*.ogv
+ \,*.opus
+ \,*.pbm
+ \,*.pdf
+ \,*.png
+ \,*.ppt
+ \,*.psd
+ \,*.pyc
+ \,*.rar
+ \,*.rm
+ \,*.s3m
+ \,*.sdbm
+ \,*.sqlite
+ \,*.swf
+ \,*.swp
+ \,*.tar
+ \,*.tga
+ \,*.ttf
+ \,*.wav
+ \,*.webm
+ \,*.xbm
+ \,*.xcf
+ \,*.xls
+ \,*.xlsx
+ \,*.xpm
+ \,*.xz
+ \,*.zip
" Allow me to be lazy and type a path to complete on the Ex command line in
" all-lowercase, and transform the consequent completion to match the
@@ -997,10 +1053,15 @@ endif
" background. For any other color scheme, turn the option off, because it
" almost always stands out too much for my liking.
"
+" You'd think the autocommand pattern here could be used to match the colour
+" scheme name, and it can be...after patch v7.4.108, when Christian Brabandt
+" fixed it. Until that version, it matched against the current buffer name,
+" so we're forced to have an explicit test in the command instead.
+"
+" <https://github.com/vim/vim/releases/tag/v7.4.108>
+"
autocmd vimrc ColorScheme *
- \ set nocursorline
-autocmd vimrc ColorScheme sahara
- \ set cursorline
+ \ let &cursorline = g:colors_name ==# 'sahara'
" Use 'dark' as my default value for 'background', in the absence of an
" environment variable COLORFGBG or a response in v:termrbgresp that would set