Merge branch 'release/v9.1.0'v9.1.0

* release/v9.1.0:
  Correct attachment hints in Mutt
  Show text/enriched mail in Mutt for completeness
  Set pager_index_lines in Mutt for index context
  Restore stricter Mutt quote matching pattern
  Move Mutt status bar to top

2 files changed, 23 insertions, 10 deletions

diff --git a/VERSION b/VERSION
index f07251d5..ab843122 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.0.0
-Sun, 17 May 2020 15:44:35 +0000
+tejr dotfiles v9.1.0
+Mon, 18 May 2020 01:04:03 +0000
diff --git a/mutt/muttrc b/mutt/muttrc
index 517773d9..dd2daeaa 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,18 +1,19 @@
-# Prefer the plain text part of multipart emails, followed by the HTML part,
-# followed by any other parts.  Decode the text/html part with .mailcap's
-# chosen program (I favour Lynx).
+# Prefer the plain text part of multipart emails, followed by any enriched text
+# part (?), followed by the HTML part, followed by any other parts.  Decode the
+# text/html part with .mailcap's chosen program (I favour Lynx).
 #
-alternative_order text/plain text/html *
+alternative_order text/plain text/enriched text/html *
 auto_view text/html
 
 # If an outgoing message looks like I meant to attach something, and there
 # isn't an attachment, prompt me to make sure I haven't forgotten it.
 # I normally don't like this sort of nagging, but I'm making an exception in
 # this case, as I really do trip up on this a lot.  The default pattern of just
-# 'attach' is a bit too aggressive, so I write a slightly softer one.
+# 'attach' is a bit too aggressive, so I write a slightly softer one that
+# reflects the usual way I refer to attachments.
 #
 set abort_noattach = ask-no
-set abort_noattach_regexp = "attached is|find attached|i've attached"
+set abort_noattach_regexp = "attached is|(find|i've|see) attached"
 
 # Don't send terminal bells on errors, but do send them when new mail arrives,
 # because that should light up my tmux window label and/or urxvt window.
@@ -47,10 +48,11 @@ send-hook ~l \
 set header_cache = '~/.cache/mutt/headers'
 
 # I don't really need the major functions' key mappings displayed to me all the
-# time; I'll look them up in <help> when I do need them.  This buys me another
-# row of screen space.
+# time; I'll look them up in <help> when I do need them.  space.  In its place,
+# move the status bar up there.
 #
 unset help
+set status_on_top
 
 # Save command history; this saves other kinds of history as well, but all
 # I really want is to be able to run the same commands again even after I quit
@@ -75,6 +77,11 @@ set index_format = '%4C %Z %{%b %d %Y} %-15.15L (%?l?%4l&%4c?) %?H?[%H] ?%s'
 #
 unset markers
 
+# Show a few messages of the index when in pager mode to give a little context
+# around the message.  I should have been doing this years ago.  Oh well.
+#
+set pager_index_lines = 6
+
 # Don't move on to the next message if we're at the end of the current one just
 # because I executed <next-page>.
 #
@@ -85,6 +92,12 @@ set pager_stop
 #
 set query_command = 'abook --mutt-query %s'
 
+# I prefer a slightly stricter pattern to match what is and isn't a quote; this
+# avoids flagging things like closing braces on new lines in code blocks as
+# quotes
+#
+set quote_regexp = '^(>[ \t]*)+'
+
 # Don't delay on switching or altering mailboxes so that I see the messages;
 # just do it straight away.
 #