aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2021-02-13 01:59:52 +1300
committerTom Ryder <tom@sanctum.geek.nz>2021-02-13 01:59:52 +1300
commite6a364aa8c458958a1c0e9b47dc601b94b13070f (patch)
treebe56dec169b7fd6ea521f874c93d76099b725f84
parentMerge branch 'release/v10.25.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-e6a364aa8c458958a1c0e9b47dc601b94b13070f.tar.gz
dotfiles-e6a364aa8c458958a1c0e9b47dc601b94b13070f.zip
Merge branch 'release/v10.26.0'v10.26.0
* release/v10.26.0: Add support for Lua scripts Remove Perl-6/Raku support for the moment Add Golang filetype for *.go to Vim
-rw-r--r--VERSION4
-rw-r--r--vim/filetype.vim12
-rw-r--r--vim/scripts.vim10
3 files changed, 12 insertions, 14 deletions
diff --git a/VERSION b/VERSION
index 5ded21af..a0fec0ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v10.25.0
-Sun, 17 Jan 2021 10:01:30 +0000
+tejr dotfiles v10.26.0
+Fri, 12 Feb 2021 12:59:48 +0000
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 4ecc7aab..91cc1ec5 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -118,6 +118,10 @@ augroup filetypedetect
\ *gnupg/options
\,*gnupg/gpg.conf
\ setfiletype gpg
+ " Golang
+ autocmd BufNewFile,BufRead
+ \ ?*.go
+ \ setfiletype go
" UNIX group file
autocmd BufNewFile,BufRead
\ /etc/group
@@ -260,7 +264,7 @@ augroup filetypedetect
autocmd BufNewFile,BufRead
\ ?*.pcap
\ setfiletype pcap
- " Perl 5 files
+ " Perl files
autocmd BufNewFile,BufRead
\ ?*.pl
\,?*.pm
@@ -268,12 +272,6 @@ augroup filetypedetect
\,*/xt/?*.t
\,Makefile.PL
\ setfiletype perl
- " Perl 6 files
- autocmd BufNewFile,BufRead
- \ ?*.p6
- \,?*.pl6
- \,?*.pm6
- \ setfiletype perl6
" PHP files
autocmd BufNewFile,BufRead
\ ?*.php
diff --git a/vim/scripts.vim b/vim/scripts.vim
index 3c3c53cd..e025a77a 100644
--- a/vim/scripts.vim
+++ b/vim/scripts.vim
@@ -13,14 +13,14 @@ if s:line !~# '^#!'
elseif s:line =~# '\<[gm]\=awk\d*\>'
setfiletype awk
-" Perl 5
+" Lua
+elseif s:line =~# '\<lua\d*\>'
+ setfiletype lua
+
+" Perl
elseif s:line =~# '\<perl5\=\>'
setfiletype perl
-" Perl 6
-elseif s:line =~# '\<perl6\>'
- setfiletype perl6
-
" PHP
elseif s:line =~# '\<php\d*\>'
setfiletype php