From 9f54662b735cc763e67c2e9597df014ded12b887 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 28 Jun 2020 21:37:13 +1200 Subject: Add an issue --- ISSUES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ISSUES.md b/ISSUES.md index 5ba90368..1d4a33b9 100644 --- a/ISSUES.md +++ b/ISSUES.md @@ -32,3 +32,5 @@ Known issues newlines in their names. Can it be made to? * Highlighting the variable name in e.g. `unset -v VARNAME` works with `bash` highlighting, but not with `sh` highlighting +* The Markdown underline functions should count screen columns, not characters + or bytes -- cgit v1.2.3 From a95cd704ea9cc6fc7b1d158bff2ff92bcf458899 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 28 Jun 2020 21:37:25 +1200 Subject: Remove an idea I decided not to implement --- IDEAS.md | 1 - 1 file changed, 1 deletion(-) diff --git a/IDEAS.md b/IDEAS.md index 7391b836..8bb8214c 100644 --- a/IDEAS.md +++ b/IDEAS.md @@ -29,4 +29,3 @@ Ideas some point * I'd like a Git hook that pre-fills out "Version X.Y.Z" if making an annotated tag named `vX.Y.Z`. -* There's no reason to limit `digraph_search.vim` to insert mode only -- cgit v1.2.3 From 64b0e5b218a27b810c8da2f41d086bfc598a230f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 29 Jun 2020 01:13:08 +1200 Subject: Expand/refine Mutt thread display switching a bit --- mutt/muttrc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mutt/muttrc b/mutt/muttrc index ccd88412..e71d676c 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -268,12 +268,20 @@ macro generic,index,browser,pager \\R '\ echo "Reloaded $my_muttrc"' \ "Clear hooks and reload" -# Shortcut to toggle thread display +# I often want thread display when having to keep track of multiple +# conversations at once with multiple people replying to one another, as is +# regularly the case when reading mailing lists, but for my personal mail it's +# generally nicer to sort the messages simply by date. This macro uses +# user-defined variables to toggle $sort between "date" and "threads". +# +set sort = date set my_sort_alt = threads macro index \\t '\ -set my_sort_cur = $sort\ +set my_sort_tmp = $sort\ set sort = $my_sort_alt\ -set my_sort_alt = $my_sort_cur' \ +set my_sort_alt = $my_sort_tmp\ +unset my_sort_tmp\ +set ?sort' \ "Toggle thread display" # Set a few simple colors just for a quick visual cue of which tool I'm looking -- cgit v1.2.3 From 773e335db2057e32c9e5edfda87fe9a0f1e5b800 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 29 Jun 2020 01:17:45 +1200 Subject: Correct a few typos --- mutt/muttrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mutt/muttrc b/mutt/muttrc index e71d676c..58941f0f 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -147,7 +147,7 @@ set text_flowed set reflow_wrap = 0 # When passing mail to the sendmail binary, use the "From" address I set as the -# envelope sender, in case the local mailserver needs to do any switching or +# envelope sender, in case the local mail server needs to do any switching or # filtering based on that. # set use_envelope_from @@ -167,7 +167,7 @@ set crypt_replysign set crypt_replysignencrypted # Use a default key for self-encrypting both sent and draft messages so that -# they're protected but legible. This defaults to the GPG_KEYID environment +# they're protected but legible. This defaults to the $GPG_KEYID environment # variable, so be careful to set that lest you send useless OpenPGP headers! # My kingdom for muttrc(5) conditionals... # @@ -300,6 +300,6 @@ color status \ default color22 # Load machine-specific or account-specific settings from the helper script in -# muttrc.d, and w're done. +# muttrc.d, and we're done. # source ~/.config/mutt/muttrc.d/src| -- cgit v1.2.3 From f7a0380fc1f2c9569db1b00efb081a8c3b795c31 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 29 Jun 2020 01:19:15 +1200 Subject: Break a couple of long lines --- mutt/muttrc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mutt/muttrc b/mutt/muttrc index 58941f0f..26be2bdb 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -191,15 +191,18 @@ url=https://keys.openpgp.org/vks/v1/by-fingerprint/$pgp_default_key # a hook for sending or changing a message that forces a signature if it's # encrypted but not signed. This may not suit anyone else reading. # -send-hook '~G !~g' 'push s' -send2-hook '~G !~g' 'push s' +send-hook '~G !~g' \ + 'push s' +send2-hook '~G !~g' \ + 'push s' # Because of the order in which opportunistic encryption is applied, we queue # up a no-op change by opening the PGP menu and then doing nothing (pressing # Enter), to trigger send2-hooks to run and turn signatures on if opportunistic # encryption happens to have decided to switch encryption on. # -send-hook '!~G !~g' 'push ' +send-hook '!~G !~g' \ + 'push ' # Failing all of the above, maybe autocrypt will passively give us a key to # use, but don't store its keys in our primary keyring. -- cgit v1.2.3 From 6347ba67fc2995ca76bb4d3ee30dc0e759fc6b4d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 29 Jun 2020 01:19:52 +1200 Subject: Fix a comment block in muttrc --- mutt/muttrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mutt/muttrc b/mutt/muttrc index 26be2bdb..4abb76da 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -90,9 +90,9 @@ auto_view \ # unset markers -# Created mailboxes are in Maildir format everywhere I deploy this, so may as -# well set it in here rather than get annoyed when Mutt starts dropping mboxes -# everywhere if I leave it out of muttrc.d/*.rc. +# Created mailboxes are in Maildir format everywhere I deploy this, so I may as +# well set it in here rather than get annoyed when Mutt starts dropping files +# in mbox format everywhere if I leave it out of muttrc.d/*.rc. # set mbox_type = Maildir -- cgit v1.2.3 From 3549694b8040d7ef920af9259492da7b74c57752 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 29 Jun 2020 01:22:37 +1200 Subject: Adjust a couple more muttrc linebreaks --- mutt/muttrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mutt/muttrc b/mutt/muttrc index 4abb76da..9165386c 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -252,13 +252,15 @@ macro index,pager \\a \ # Janky notmuch-mutt search macro, cleaned up a little macro index \\l '\ -set my_pipe_decode=$pipe_decode \ +set \ + my_pipe_decode=$pipe_decode \ my_wait_key=$wait_key \ nopipe_decode \ nowait_key\ notmuch-mutt --prompt search --remove-dups\ ~/.cache/notmuch/mutt/results\ -set pipe_decode=$my_pipe_decode \ +set \ + pipe_decode=$my_pipe_decode \ wait_key=$my_wait_key' \ 'notmuch: search mail' -- cgit v1.2.3 From d8b540a2bc9571d5289deca158213fd644ead37e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 30 Jun 2020 00:00:15 +1200 Subject: Filter pandoc dashes in Mutt alternative parts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there are two consecutive em- or en-dashes on a line, change all the en dashes back to -- and the em dashes back to ---, so that we don't hack up e.g. "----- Forwarded message -----" in silly ways. This is gross, and firmly suggests I need to learn enough Lua to make Pandoc do this the way I actually want with a custom filter, but It'll Do For Now™. --- mutt/filters/markdown-to-html.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mutt/filters/markdown-to-html.sh b/mutt/filters/markdown-to-html.sh index cdba8ace..5fe28560 100644 --- a/mutt/filters/markdown-to-html.sh +++ b/mutt/filters/markdown-to-html.sh @@ -4,4 +4,5 @@ pandoc \ --from markdown_strict+smart \ --metadata=pagetitle:HTML \ --standalone \ - --to html4 + --to html4 | +sed '/[—–][—–]/{s/—/---/g;s/–/--/g}' -- cgit v1.2.3 From ade93c95766b7f77e893f11c3676f5cd96a2c93c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 30 Jun 2020 00:04:26 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2acb458c..097dc1ee 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v9.27.0 -Sun, 28 Jun 2020 04:31:26 +0000 +tejr dotfiles v10.0.0 +Mon, 29 Jun 2020 12:04:25 +0000 -- cgit v1.2.3