diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-17 15:45:29 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-17 15:45:29 +1200 |
commit | 282c1a6a934e7197343c9a1aee8802393acd3454 (patch) | |
tree | 9abf2dfdb6089a08387c8ac769a65d486f9c08b0 | |
parent | Merge branch 'release/v8.38.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-282c1a6a934e7197343c9a1aee8802393acd3454.tar.gz dotfiles-282c1a6a934e7197343c9a1aee8802393acd3454.zip |
Merge branch 'release/v8.39.0'v8.39.0
* release/v8.39.0:
Use less misleading suffix for group lists
Don't use protected PGP headers anymore
Remove inappropriate reverse() call
Remove vestigial reference to $MYVIM without cond
Add a few more filetype detection hooks
Correct a comment
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | mutt/muttrc | 1 | ||||
-rwxr-xr-x | mutt/muttrc.d/src | 4 | ||||
-rw-r--r-- | vim/filetype.vim | 29 | ||||
-rw-r--r-- | vim/vimrc | 8 |
5 files changed, 36 insertions, 10 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v8.38.0 -Fri, 15 May 2020 15:43:40 +0000 +tejr dotfiles v8.39.0 +Sun, 17 May 2020 03:45:25 +0000 diff --git a/mutt/muttrc b/mutt/muttrc index 3af07a55..e2356dd0 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -102,7 +102,6 @@ set thorough_search = yes set time_inc = 250 # Encryption settings -set crypt_protected_headers_write = yes set crypt_replysign = yes set crypt_replyencrypt = yes set crypt_replysignencrypted = yes diff --git a/mutt/muttrc.d/src b/mutt/muttrc.d/src index 8b2aad6b..f03ad462 100755 --- a/mutt/muttrc.d/src +++ b/mutt/muttrc.d/src @@ -1,11 +1,11 @@ #!/bin/sh # Build groups from address lists -for rc in "$HOME"/.config/mutt/muttrc.d/groups/*.rc ; do +for rc in "$HOME"/.config/mutt/muttrc.d/groups/*.list ; do [ -e "$rc" ] || continue group=$rc group=${group##*/} - group=${group%.rc} + group=${group%.list} while read -r member ; do printf 'group -group %s -addr %s\n' \ "$group" "$member" diff --git a/vim/filetype.vim b/vim/filetype.vim index 339824f0..91327ba0 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -171,6 +171,11 @@ augroup filetypedetect \ ?*.l \,?*.lex \ setfiletype lex + " limits.conf(5) files + autocmd BufNewFile,BufRead + \ limits.conf + \,*/limits.d/*.conf + \ setfiletype limits " Lisp autocmd BufNewFile,BufRead \ ?*.lisp @@ -191,10 +196,15 @@ augroup filetypedetect \ ?*.msg \,mutt-*-[0-9]\+-[0-9]\+-[0-9]\+ \ setfiletype mail - " Mail messages + " Mail aliases autocmd BufNewFile,BufRead \ aliases \ setfiletype mailaliases + " Mailcap (MIME app reference) files + autocmd BufNewFile,BufRead + \ mailcap + \,.mailcap + \ setfiletype mailcap " Makefiles autocmd BufNewFile,BufRead \ Makefile @@ -246,6 +256,10 @@ augroup filetypedetect \,/etc/shadow- \,/etc/shadow.edit \ setfiletype passwd + " Packet capture files + autocmd BufNewFile,BufRead + \ ?*.pcap + \ setfiletype pcap " Perl 5 files autocmd BufNewFile,BufRead \ ?*.pl @@ -272,6 +286,10 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.pod6 \ setfiletype pod6 + " protocols(5) files + autocmd BufNewFile,BufRead + \ protocols + \ setfiletype protocols " Python files autocmd BufNewFile,BufRead \ ?*.py @@ -299,6 +317,10 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.rb \ setfiletype ruby + " Samba config + autocmd BufNewFile,BufRead + \ smb.conf + \ setfiletype samba " sed files autocmd BufNewFile,BufRead \ ?*.sed @@ -367,6 +389,11 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ svn-commit*.tmp \ setfiletype svn + " sysctl configuration files + autocmd BufNewFile,BufRead + \ /etc/sysctl.conf + \,/etc/sysctl.d/*.conf + \ setfiletype sysctl " Systemd unit files autocmd BufNewFile,BufRead \ */systemd/*.* @@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Fri, 15 May 2020 13:24:13 UTC +" Last updated: Sat, 16 May 2020 04:57:25 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -370,7 +370,7 @@ endif " <https://github.com/vim/vim/releases/tag/v7.0.187> " if exists('##SourceCmd') - autocmd vimrc SourceCmd $MYVIMRC,$MYVIM/vimrc + autocmd vimrc SourceCmd $MYVIMRC/vimrc \ ReloadVimrc if $MYVIM !=# '' autocmd vimrc SourceCmd $MYVIM/vimrc @@ -438,10 +438,10 @@ if xdg#DataHome() !=# '' || !empty(xdg#DataDirs()) \ 'option#item#Escape(v:val.''/dictionary.txt'')' \), ',')) execute 'set thesaurus^='.option#Escape(join(map( - \ reverse(extend( + \ extend( \ xdg#DataHome() !=# '' ? [xdg#DataHome()] : [], \ xdg#DataDirs() - \)), + \), \ 'option#item#Escape(v:val.''/thesaurus.txt'')' \), ',')) endif |