aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-01-05 01:07:49 +1300
committerTom Ryder <tom@sanctum.geek.nz>2020-01-05 01:07:49 +1300
commit4fab9517f9bd115a6abbf49231bab66f05f81279 (patch)
tree0c6b7a7372f6e4b31f41e0892a7ad2ef74f06d4d
parentMerge branch 'release/v8.9.0' (diff)
parentUpdate PGP key (diff)
downloaddotfiles-4fab9517f9bd115a6abbf49231bab66f05f81279.tar.gz
dotfiles-4fab9517f9bd115a6abbf49231bab66f05f81279.zip
Merge branch 'release/v8.10.0'v8.10.0
* release/v8.10.0: Update PGP key Rename filetype repeat commands Fix case sensitivity of an operator for vim-vint
-rw-r--r--VERSION4
-rw-r--r--finger/pgpkey8
-rw-r--r--vim/autoload/filetype/repeat.vim (renamed from vim/autoload/filetype.vim)4
-rw-r--r--vim/autoload/mail/header.vim2
-rw-r--r--vim/filetype.vim4
5 files changed, 11 insertions, 11 deletions
diff --git a/VERSION b/VERSION
index 25a80e4f..c5e7377d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.9.0
-Fri, 03 Jan 2020 03:41:18 +0000
+tejr dotfiles v8.10.0
+Sat, 04 Jan 2020 12:07:46 +0000
diff --git a/finger/pgpkey b/finger/pgpkey
index f1c4c402..a19c98f8 100644
--- a/finger/pgpkey
+++ b/finger/pgpkey
@@ -1,4 +1,4 @@
-pub rsa4096 2013-03-12 [C] [expires: 2020-01-18]
+pub rsa4096 2013-03-12 [SC] [expires: 2020-04-03]
FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872
uid [ultimate] Thomas Ryder (tyrmored, tejr) <tom@sanctum.geek.nz>
uid [ultimate] Thomas Ryder <tejr@echo-n.nz>
@@ -6,9 +6,9 @@ uid [ultimate] Thomas Ryder <secretary@plug.org.nz>
uid [ultimate] Thomas Ryder (TEJR) <tejr@cpan.org>
uid [ultimate] Thomas Ryder <tyrmored@inspire.net.nz>
uid [ultimate] Thomas Ryder <tej.ryder@gmail.com>
-sub rsa4096 2013-03-12 [E] [expires: 2020-01-18]
+sub rsa4096 2013-03-12 [E] [expires: 2020-04-03]
9DF1 A89F F8D9 70AF 3265 C882 96C2 CD91 E67A C61D
-sub rsa4096 2013-03-12 [S] [expires: 2020-01-18]
+sub rsa4096 2013-03-12 [S] [expires: 2020-04-03]
3179 90A1 4597 A1FC F82D 953A B5AF 5F89 2592 6609
-sub rsa4096 2019-08-06 [A] [expires: 2020-01-18]
+sub rsa4096 2019-08-06 [A] [expires: 2020-04-03]
42AE 569D 6162 7C52 03B0 74ED D58F F1F0 7E90 9B49
diff --git a/vim/autoload/filetype.vim b/vim/autoload/filetype/repeat.vim
index 6a66d62e..f681932b 100644
--- a/vim/autoload/filetype.vim
+++ b/vim/autoload/filetype/repeat.vim
@@ -1,6 +1,6 @@
" Helper function to run the 'filetypedetect' group on a file with its
" extension stripped off
-function! filetype#StripRepeat() abort
+function! filetype#repeat#Strip() abort
" Check we have the fnameescape() function
if !exists('*fnameescape')
@@ -33,7 +33,7 @@ endfunction
" Helper function to run the 'filetypedetect' group on a file in a temporary
" sudoedit(8) directory, modifying it with an attempt to reverse the temporary
" filename change
-function! filetype#SudoRepeat() abort
+function! filetype#repeat#Sudo() abort
" Check we have the fnameescape() function
if !exists('*fnameescape')
diff --git a/vim/autoload/mail/header.vim b/vim/autoload/mail/header.vim
index 7a360a2c..5284b84d 100644
--- a/vim/autoload/mail/header.vim
+++ b/vim/autoload/mail/header.vim
@@ -15,7 +15,7 @@ function! mail#header#Read() abort
\ 'body': matchlist[2],
\}
call add(fields, field)
- elseif line =~ '^\s' && exists('field')
+ elseif line =~# '^\s' && exists('field')
let field['body'] .= "\n" . line
elseif line ==# ''
break
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 12edb3d2..137d1cf5 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -16,7 +16,7 @@ augroup filetypedetect
\,?*~
\,?*.{bak,example,in,new,old,orig,sample,test}
\,?*.dpkg-{bak,dist,new,old}
- \ call filetype#StripRepeat()
+ \ call filetype#repeat#Strip()
" Stuff Tom cares about enough and edits often enough to type based on
" filename patterns follows.
@@ -474,7 +474,7 @@ augroup filetypedetect
\ /var/tmp/?*????????.*
\,/var/tmp/?*.????????
\ if !did_filetype()
- \| call filetype#SudoRepeat()
+ \| call filetype#repeat#Sudo()
\|endif
" Generic text, config, and log files, if no type assigned yet