diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-05-28 22:47:00 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-05-28 22:47:00 +1200 |
commit | d94f27ffd67524a01186e1f5ad0dc8b39fa7de89 (patch) | |
tree | d3bcaa7e7805009d8eb34b5e199559b55c9599b1 | |
parent | Merge branch 'release/v4.49.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-d94f27ffd67524a01186e1f5ad0dc8b39fa7de89.tar.gz dotfiles-d94f27ffd67524a01186e1f5ad0dc8b39fa7de89.zip |
Merge branch 'release/v4.50.0'v4.50.0
* release/v4.50.0:
Bump VERSION
Update to vim-insert-cancel v5.0.0
Update vim-scroll-next to v1.0.0
Update vim-scroll-next to v0.3.0
Don't split entire array just to get first element
Whoops, I didn't mean to leave these in here
Refine apostrophe matching for mail greetings
Update vim-vimrc-reload-filetype to v1.0.0
Update vim-insert-timeout to v1.0.1
Enable forward_attachments in Mutt
Enable crypt_protected_headers_write in Mutt
Update vim-quickfix-auto-open to v1.0.0
Adjust a concatenated string
Update vim-insert-suspend-hlsearch to v1.0.0
Update vim-quickfix-auto-open to v1.0.0
Update vim-copy-linebreak to v1.0.0
Update vim-paste-open to v2.0.0
Update vim-cursorline-current to v0.4.0
Update vim-insert-cancel to v4.0.0
Move 'viminfofile'
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | mutt/muttrc | 2 | ||||
-rw-r--r-- | vim/after/ftplugin/mail.vim | 4 | ||||
m--------- | vim/bundle/copy_linebreak | 0 | ||||
m--------- | vim/bundle/cursorline_current | 0 | ||||
m--------- | vim/bundle/insert_cancel | 0 | ||||
m--------- | vim/bundle/insert_suspend_hlsearch | 0 | ||||
m--------- | vim/bundle/insert_timeout | 0 | ||||
m--------- | vim/bundle/paste_open | 0 | ||||
m--------- | vim/bundle/quickfix_auto_open | 0 | ||||
m--------- | vim/bundle/redact_pass | 0 | ||||
m--------- | vim/bundle/scroll_next | 0 | ||||
m--------- | vim/bundle/vimrc_reload_filetype | 0 | ||||
-rw-r--r-- | vim/vimrc | 10 |
14 files changed, 11 insertions, 9 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v4.49.0 -Sat May 25 06:05:22 UTC 2019 +tejr dotfiles v4.50.0 +Tue May 28 10:47:00 UTC 2019 diff --git a/mutt/muttrc b/mutt/muttrc index 1fb9274a..b61b4af6 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -87,6 +87,7 @@ set quote_regexp = '^(>[ \t]*)+' # Responses set fast_reply = yes +set forward_attachments = yes set forward_format = 'Fw: %s' set include = yes set use_envelope_from = yes @@ -101,6 +102,7 @@ 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/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim index 76605d03..937ee40c 100644 --- a/vim/after/ftplugin/mail.vim +++ b/vim/after/ftplugin/mail.vim @@ -15,13 +15,13 @@ if line('.') == 1 && col('.') == 1 while getline('.') =~? '^> *' \ . '\%(' \ . '\%(' - \ . 'g[''’]\=day' + \ . "g['\u2019]\\=day" \ . '\|\%(good \)\=\%(morning\|afternoon\|evening\)' \ . '\|h[eu]\%(ll\|rr\)o\+' \ . '\|hey\+' \ . '\|hi\+' \ . '\|sup' - \ . '\|what''s up' + \ . "\\|what['\u2019]\\=s up" \ . '\|yo' \ . '\)' \ . '[[:punct:] ]*' diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak -Subproject 98eb34d4ef603039cd9d5a50e3c4f12fcb943fc +Subproject 6692eef760ccfc2e1b888d1d604e3e1a156fcbc diff --git a/vim/bundle/cursorline_current b/vim/bundle/cursorline_current -Subproject 90ffeabc80c0f27748213d30952ad00a8e57b09 +Subproject 1db91b7e90801021f11fb1ff4f5917e6df04d3d diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel -Subproject 0b86ed61400d5935b378f909a81ec3b3f6b41fe +Subproject e8f1153d387782d966b8a07b7b91efe5ddeff42 diff --git a/vim/bundle/insert_suspend_hlsearch b/vim/bundle/insert_suspend_hlsearch -Subproject 39e9abea82f6485cc429f05a03f63c9cabf086c +Subproject 0378547786e68b7825fa4893efd7cd240202f12 diff --git a/vim/bundle/insert_timeout b/vim/bundle/insert_timeout -Subproject a8e2ed01eb1b5deafb44f1c51b8ab8f78911a25 +Subproject 92bf8165bfeba13384cba57905a3d850db44816 diff --git a/vim/bundle/paste_open b/vim/bundle/paste_open -Subproject e26c80bac5ab5592ddd4d2186180a85e58d8ba8 +Subproject 79ee83eac32dbadf722df687e65f07d75a2f8ea diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open -Subproject bc88f5e2c911ad9148bd76a3c78f43e8a878bd7 +Subproject 0b642ea72474f289ce463b2ddc3fdb104f0abdf diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass -Subproject f3c2ffa6ba2bf9949d5de8d37b4426c22885ad9 +Subproject 4e5727fae46e154bf4161b6b481071ed0256406 diff --git a/vim/bundle/scroll_next b/vim/bundle/scroll_next -Subproject d1c87018e705e976b1e500ab32fcfe1a0344557 +Subproject 6529dc5ef3cea4c929da150ee749ceb3d8b891b diff --git a/vim/bundle/vimrc_reload_filetype b/vim/bundle/vimrc_reload_filetype -Subproject 296bd0d8aff7a343cf3d0c56eaa633e227bc432 +Subproject 1a59433fa33f737264af73a7323ce669fa14a21 @@ -4,7 +4,9 @@ " Set an environment variable for the user runtime directory, if not already " set; use the first element of &runtimepath, rather like 'spellfile' if !exists('$MYVIM') - let $MYVIM = expand(split(&runtimepath, ',')[0]) + let $MYVIM = expand( + \ strpart(&runtimepath, 0, stridx(&runtimepath, ',')) + \ ) endif " The all-important default indent settings; filetypes to tweak @@ -25,9 +27,7 @@ set backspace= " Keep backup files in dedicated directory; add trailing double-slash to keep " full path in name, if Vim is new enough to support that set backup -execute 'set backupdir^=' - \ . escape($MYVIM, '\ ') - \ . '/cache/backup' +execute 'set backupdir^='.escape($MYVIM, '\ ').'/cache/backup' \ . (has('patch-8.1.251') ? '//' : '') " Add some *nix paths not to back up @@ -179,7 +179,7 @@ endif " Keep the viminfo file in the home Vim directory, mostly to stop history " getting clobbered when something runs Vim without using this vimrc -let $VIMINFO = $MYVIM.'/viminfo' +let $VIMINFO = $MYVIM.'/cache/viminfo' if exists('+viminfofile') " Use new option method if we can (v8.1.716) set viminfofile=$VIMINFO else " Resort to clunkier method with 'viminfo' option flag |