From 1ce9f9ce93c456c6b9d7662d483470ee3ffc2daa Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Sat, 14 Feb 2015 03:47:06 +0100
Subject: mutt: Reorder, change comments

---
 mutt/muttrc | 84 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/mutt/muttrc b/mutt/muttrc
index cdd47f4..0a3569d 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,26 +1,26 @@
 # Compose View Options -------------------------------
 set realname         = "Johannes Löthberg"
 set from             = "johannes@kyriasis.com"
-set envelope_from    # which from?
-set edit_headers     # show headers when composing
-set fast_reply       # skip to compose when replying
-set fcc_attach       # save attachments with the body
-set mime_forward     # do not forward attachments as part of body
-set forward_format   = "Fwd: %s" # format of subject when forwarding
-set forward_decode   # decode when forwarding
-set attribution      = "On %d, %n wrote:" # format of quoting header
-set reply_to         # reply to Reply to: field
-set reverse_name     # reply as whomever it was to
-set include          # include message in replies
-set forward_quote    # include message in forwards
-set charset          = "utf-8"
-set send_charset     = "utf-8"
+set envelope_from    # “From:” from envelope sender
+set reverse_name     # Reply as whomever it was to
+set reply_to         # Reply to Reply to: field
+
+set fast_reply       # Skip prompts directly to compose when replying
+set fcc_attach       # Save attachments with the body
+set mime_forward     # Forward messages as MIME part
+set forward_format   = "Fwd: %s" # Format of subject when forwarding
+set attribution      = "On %d, %n wrote:" # Format of quoting header
+set include          # Include message in replies
+set forward_quote    # Include message in forwards
+
+set charset          = "utf-8" # Terminal charset for display/input
+set send_charset     = "utf-8" # Charset for outgoing messages
 set config_charset   = "utf-8"
 
-set editor           = "vim"
-set text_flowed      = yes
-set mark_old         = no
-set sleep_time       = 0 # no delay when opening a maildir!
+set edit_headers     # Edit headers when editing
+set editor           = "vim" # Editor used by mutt
+set text_flowed      = yes # Generate flowed attachments
+set sleep_time       = 0 # No delay when opening a maildir!
 
 set mbox_type        = Maildir
 set folder           = "~/mail"
@@ -34,6 +34,7 @@ set spoolfile        = "+Inbox"
 set mbox             = "+archives"
 set postponed        = "+Drafts"
 mailboxes +Inbox +Sent +learn-spam +Drafts +Trash +archives +arch-dev-public +aur-general +arch-bugs +Spam +Ham +openldap-technical +opensmtpd +pacman-dev
+set record           = "+Sent"
 
 set query_command='goobook -c "$XDG_CONFIG_HOME/goobookrc" query "%s"'
 macro index,pager A "<pipe-message>goobook -c \"$XDG_CONFIG_HOME/goobookrc\" add<return>" "add the sender address to Google contacts"
@@ -44,7 +45,6 @@ macro index O       '<shell-escape>mbsync -c "$XDG_CONFIG_HOME/mbsyncrc" theos<r
 
 set sendmail        = "/usr/bin/msmtp --file $XDG_CONFIG_HOME/msmtprc -a theos"
 set sendmail_wait   = 0
-set record          = +Sent
 set copy            = yes
 
 unset confirmappend # don't ask, just do!
@@ -76,27 +76,31 @@ set pager_stop           # don't go to next message automatically
 set menu_scroll          # scroll in menus
 set tilde                # show tildes like in vim
 unset markers            # no ugly plus signs
-set ignore_list_reply_to = yes
+set ignore_list_reply_to = yes # Ignore mangled Reply-To:'s from MLs
 
 set quote_regexp         = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 alternative_order text/plain text/enriched text/html
 
 
-macro index C       "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index M       "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+macro index C      "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index M      "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
 
-bind index gg       first-entry
-bind index G        last-entry
-bind index R        group-reply
-bind index S        sync-mailbox
-bind index <space>  collapse-thread
+bind index gg      first-entry
+bind index G       last-entry
+bind index R       group-reply
+bind index S       sync-mailbox
+bind index <space> collapse-thread
 
 # Pager Key Bindings ---------------------------------
-bind pager k        previous-line
-bind pager j        next-line
-bind pager gg       top
-bind pager G        bottom
-bind pager R        group-reply
+bind pager k       previous-line
+bind pager j       next-line
+bind pager gg      top
+bind pager G       bottom
+bind pager R       group-reply
+
+# Save and recall drafts
+bind compose P     postpone-message
+bind index P       recall-message
 
 # Move message to archives
 macro index,pager a "<save-message>=archives<enter>"
@@ -104,17 +108,13 @@ macro index,pager a "<save-message>=archives<enter>"
 # View attachments properly.
 bind attach <return> view-mailcap
 
-# Save and recall drafts
-bind compose P      postpone-message
-bind index P        recall-message
-
 source ~/.config/mutt/gpg.rc
-set crypt_autosign      = yes
-set crypt_replyencrypt  = no
-set crypt_verify_sig    = yes
-set pgp_sign_as         = 3A9D0BB5
-set pgp_use_gpg_agent   = yes
-set crypt_use_pka       = yes
+set crypt_autosign     = yes
+set crypt_replyencrypt = no
+set crypt_verify_sig   = yes
+set pgp_sign_as        = 3A9D0BB5
+set pgp_use_gpg_agent  = yes
+set crypt_use_pka      = yes
 
 source ~/.config/mutt/themes/comidia
 
-- 
cgit v1.2.3-70-g09d2