e7f1e7f3a797
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Wed, 08 Jul 2015 11:52:20 -0400 |
parents | f8ea2a0220bb (current diff) ac0a622a5245 (diff) |
children | 7e5a8f221df6 |
branches/tags | (none) |
files |
Changes
--- a/.hgsubstate Wed Jul 08 11:51:55 2015 -0400 +++ b/.hgsubstate Wed Jul 08 11:52:20 2015 -0400 @@ -39,7 +39,7 @@ 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround 67ffe58818930e95163ead541a2700cec41c13f7 vim/bundle/syntastic -c4dda1da8d6b290c9d01f5568cfb6f0effeeb3de vim/bundle/timl -bf4a599901e0a9c85238158c661351dfaa1c91c2 vim/bundle/tslime2 +01deb947b22201c8a3dfee5ae97b11228bd9cc36 vim/bundle/timl +d143308c5f385cce76dba5abf7b8b3737d711a4f vim/bundle/tslime2 84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dummycert.pem Wed Jul 08 11:52:20 2015 -0400 @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICsDCCAhmgAwIBAgIJAIZL28AY7zJ4MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwHhcNMTQxMTA3MDIyNDIxWhcNMjQxMTA0MDIyNDIxWjBF +MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 +ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB +gQC8c7Q9AneAWIJv23e5whiMGJB7c1TLGoG27wAGXFTSD0vrIRRyCiPYsSo9j+JB +aYLab3fS8w0qRzFM9X7WTF9CXDvmGVj4OA3ntY558PzsAhpyy3kr0lkj0SYGQgDd +cKu4KTvA5oWvcimOuNUJ1jyVGtLqY+EgU1PhF5/Y2NF1+QIDAQABo4GnMIGkMB0G +A1UdDgQWBBSlPdiW6VNSj9dZJOv3QG5r4ZKtADB1BgNVHSMEbjBsgBSlPdiW6VNS +j9dZJOv3QG5r4ZKtAKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUt +U3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAIZL28AY +7zJ4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAFI9zhHmno/I+iOzA +7i3A3vYgUC1IfUNof8f4m36ASaMMkLTY99SadWiFi/9566ownggmgPHhnwT+BMPV +YZK7ivIih/8yrU0OzD+cS0s2eHbd7H94vtyN6GRYnBecXmEISJX+sO8SsVuf/BP3 +OwIO0pA099rRE9LtV87yQV55Rmo= +-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fish/functions/gigfor.fish Wed Jul 08 11:52:20 2015 -0400 @@ -0,0 +1,3 @@ +function gigfor + cp ~/Dropbox/tasks/gig-archive ~/Dropbox/tasks/gig.txt +end
--- a/mutt/muttrc Wed Jul 08 11:51:55 2015 -0400 +++ b/mutt/muttrc Wed Jul 08 11:52:20 2015 -0400 @@ -206,7 +206,7 @@ macro index \" "<change-folder>+archive<enter>" "go to archive" # Search with notmuch -macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/search<enter><change-folder-readonly>+search<enter>" "search mail (using notmuch)" +macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/search<enter><change-folder-readonly>~/.mail/search<enter>" "search mail (using notmuch)" # Unlimit (show [a]ll) macro index a "<limit>all\n" "show all messages (undo limit)"