From: Richard Russon Date: Fri, 7 Jul 2017 16:54:41 +0000 (+0100) Subject: tidy whitespace X-Git-Tag: neomutt-20170707^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c32b44197dd26223d663823af0274581c319db5a;p=neomutt tidy whitespace --- diff --git a/contrib/Makefile.am b/contrib/Makefile.am index bd42ec49c..b9241d295 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -6,7 +6,7 @@ SAMPLES = colors.default colors.linux gpg.rc Mush.rc pgp2.rc pgp5.rc pgp6.rc \ EXTRA_DIST = $(SAMPLES) colorschemes hcache-bench iconv/make.sh iconv/README \ keybase language.txt language50.txt logo lua \ - patch.slang-1.2.2.keypad.1 smime_keys vim-keys + patch.slang-1.2.2.keypad.1 smime_keys vim-keys CONTRIB_DIRS = colorschemes hcache-bench keybase logo lua vim-keys diff --git a/contrib/colorschemes/solarized-dark-256.muttrc b/contrib/colorschemes/solarized-dark-256.muttrc index b3186518f..0cdbea53b 100644 --- a/contrib/colorschemes/solarized-dark-256.muttrc +++ b/contrib/colorschemes/solarized-dark-256.muttrc @@ -24,16 +24,16 @@ # base03, bg, black, any of the non brights # basic colors --------------------------------------------------------- -color normal color241 color234 -color error color160 color234 -color tilde color235 color234 -color message color37 color234 -color markers color160 color254 -color attachment color254 color234 -color search color61 color234 -#color status J_black J_status -color status color241 color235 -color indicator color234 color136 +color normal color241 color234 +color error color160 color234 +color tilde color235 color234 +color message color37 color234 +color markers color160 color254 +color attachment color254 color234 +color search color61 color234 +#color status J_black J_status +color status color241 color235 +color indicator color234 color136 color tree color136 color234 # arrow in threads # basic monocolor screen @@ -88,22 +88,22 @@ color index color136 color160 "~v~(~D)" # message headers ------------------------------------------------------ #color header color240 color234 "^" -color hdrdefault color240 color234 +color hdrdefault color240 color234 color header color241 color234 "^(From)" color header color33 color234 "^(Subject)" # body ----------------------------------------------------------------- -color quoted color33 color234 -color quoted1 color37 color234 -color quoted2 color136 color234 -color quoted3 color160 color234 -color quoted4 color166 color234 +color quoted color33 color234 +color quoted1 color37 color234 +color quoted2 color136 color234 +color quoted3 color160 color234 +color quoted4 color166 color234 -color signature color240 color234 -color bold color235 color234 -color underline color235 color234 -color normal color244 color234 +color signature color240 color234 +color bold color235 color234 +color underline color235 color234 +color normal color244 color234 # color body color245 color234 "[;:][-o][)/(|]" # emoticons color body color245 color234 "[;:][)(|]" # emoticons diff --git a/contrib/colorschemes/vombatidae.mutt b/contrib/colorschemes/vombatidae.mutt index ab9f3cf80..628fb9bf0 100644 --- a/contrib/colorschemes/vombatidae.mutt +++ b/contrib/colorschemes/vombatidae.mutt @@ -6,31 +6,31 @@ # # Mutt colorscheme loosely inspired by vim colorscheme wombat.vim. # -# Changelog: +# Changelog: # 0.1 - Initial version # --- vombatidae text colors --- -# color normal color230 color234 -# color message color230 color234 +# color normal color230 color234 +# color message color230 color234 # --- slightly less yellow text colors --- -color normal color253 color234 # mod -# color normal color253 color233 # mod -# color normal color253 default # mod -color indicator color230 color238 -color status color101 color16 -# color tree color113 color234 -# color tree color173 color234 -color tree color208 color234 -color signature color102 color234 -color message color253 color234 -color attachment color117 color234 -color error color30 color234 -color tilde color130 color235 +color normal color253 color234 # mod +# color normal color253 color233 # mod +# color normal color253 default # mod +color indicator color230 color238 +color status color101 color16 +# color tree color113 color234 +# color tree color173 color234 +color tree color208 color234 +color signature color102 color234 +color message color253 color234 +color attachment color117 color234 +color error color30 color234 +color tilde color130 color235 -color search color100 default -color markers color138 default +color search color100 default +color markers color138 default # mono bold reverse # color bold color173 color191 @@ -54,42 +54,42 @@ color quoted9 color138 color234 # color body green default "(^| )_[-a-z0-9_]+_[,.?]?[\n]" # color body red default "(^| )\\*[-a-z0-9*]+\\*[,.?]?[ \n]" # color body green default "(^| )_[-a-z0-9_]+_[,.?]?[ \n]" -color index color202 color234 ~F # Flagged -color index color39 color234 ~N # New -color index color39 color234 ~O -color index color229 color22 ~T # Tagged -color index color240 color234 ~D # Deleted +color index color202 color234 ~F # Flagged +color index color39 color234 ~N # New +color index color39 color234 ~O +color index color229 color22 ~T # Tagged +color index color240 color234 ~D # Deleted # --- -#mono body reverse '^(subject):.*' -#color body brightwhite magenta '^(subject):.*' -#mono body reverse '[[:alpha:]][[:alnum:]-]+:' -#color body black cyan '[[:alpha:]][[:alnum:]-]+:' +#mono body reverse '^(subject):.*' +#color body brightwhite magenta '^(subject):.*' +#mono body reverse '[[:alpha:]][[:alnum:]-]+:' +#color body black cyan '[[:alpha:]][[:alnum:]-]+:' # --- header --- -color hdrdefault color30 color233 -color header color132 color233 '^date:' -color header color153 color233 '^(to|cc|bcc):' -color header color120 color233 '^from:' -color header color178 color233 '^subject:' -color header color31 color233 '^user-agent:' -color header color29 color233 '^reply-to:' +color hdrdefault color30 color233 +color header color132 color233 '^date:' +color header color153 color233 '^(to|cc|bcc):' +color header color120 color233 '^from:' +color header color178 color233 '^subject:' +color header color31 color233 '^user-agent:' +color header color29 color233 '^reply-to:' -#color header magenta default '^(status|lines|date|received|sender|references):' -#color header magenta default '^(pr|mime|x-|user|return|content-)[^:]*:' -#color header brightyellow default '^content-type:' -#color header magenta default '^content-type: *text/plain' -# color header brightgreen default '^list-[^:]*:' -#mono header bold '^(subject):.*$' -#color header brightcyan default '^(disposition)' -#color header green default '^(mail-)?followup' -#color header white default '^reply' -#color header brightwhite default '^(resent)' -# color header brightwhite default '^from:' +#color header magenta default '^(status|lines|date|received|sender|references):' +#color header magenta default '^(pr|mime|x-|user|return|content-)[^:]*:' +#color header brightyellow default '^content-type:' +#color header magenta default '^content-type: *text/plain' +# color header brightgreen default '^list-[^:]*:' +#mono header bold '^(subject):.*$' +#color header brightcyan default '^(disposition)' +#color header green default '^(mail-)?followup' +#color header white default '^reply' +#color header brightwhite default '^(resent)' +# color header brightwhite default '^from:' -#mono index bold '~h "^content-type: *(multipart/(mixed|signed|encrypted)|application/)"' -#color index green black '~h "^content-type: *multipart/(signed|encrypted)"' +#mono index bold '~h "^content-type: *(multipart/(mixed|signed|encrypted)|application/)"' +#color index green black '~h "^content-type: *multipart/(signed|encrypted)"' -#color sidebar_new color39 color234 +#color sidebar_new color39 color234 diff --git a/contrib/patch.slang-1.2.2.keypad.1 b/contrib/patch.slang-1.2.2.keypad.1 index 4f51cd6cb..b7e35d74a 100644 --- a/contrib/patch.slang-1.2.2.keypad.1 +++ b/contrib/patch.slang-1.2.2.keypad.1 @@ -1,21 +1,21 @@ diff -ur slang.old/src/slcurses.c slang/src/slcurses.c ---- slang.old/src/slcurses.c Fri Apr 24 09:16:46 1998 -+++ slang/src/slcurses.c Sat Jul 4 07:30:31 1998 +--- slang.old/src/slcurses.c Fri Apr 24 09:16:46 1998 ++++ slang/src/slcurses.c Sat Jul 4 07:30:31 1998 @@ -134,7 +134,10 @@ - } - else if (ch == 0xFFFF) return ERR; - SLang_ungetkey (ch); -- return SLkp_getkey (); -+ if ((ch = SLkp_getkey ()) != SL_KEY_ERR) -+ return ch; -+ else -+ return SLang_getkey (); - } - return SLang_getkey (); + } + else if (ch == 0xFFFF) return ERR; + SLang_ungetkey (ch); +- return SLkp_getkey (); ++ if ((ch = SLkp_getkey ()) != SL_KEY_ERR) ++ return ch; ++ else ++ return SLang_getkey (); + } + return SLang_getkey (); } diff -ur slang.old/src/slkeymap.c slang/src/slkeymap.c ---- slang.old/src/slkeymap.c Fri Apr 24 09:16:47 1998 -+++ slang/src/slkeymap.c Sat Jul 4 07:41:42 1998 +--- slang.old/src/slkeymap.c Fri Apr 24 09:16:47 1998 ++++ slang/src/slkeymap.c Sat Jul 4 07:41:42 1998 @@ -343,6 +343,8 @@ SLang_Key_Type *SLang_do_key(SLKeyMap_List_Type *kml, int (*getkey)(void)) @@ -35,26 +35,26 @@ diff -ur slang.old/src/slkeymap.c slang/src/slkeymap.c @@ -372,7 +375,11 @@ - key = kml->keymap + input_ch; - if (key->type == 0) -+ { -+ if (getkey == (int (*)(void)) SLang_getkey) -+ SLang_ungetkey_string (SLang_Undo_Buffer, SLang_Undo_Len); - return NULL; -+ } + key = kml->keymap + input_ch; + if (key->type == 0) ++ { ++ if (getkey == (int (*)(void)) SLang_getkey) ++ SLang_ungetkey_string (SLang_Undo_Buffer, SLang_Undo_Len); + return NULL; ++ } } /* It appears to be a prefix character in a key sequence. */ @@ -385,6 +392,7 @@ { - SLang_Key_TimeOut_Flag = 1; - SLang_Last_Key_Char = (*getkey)(); -+ SLang_Undo_Buffer [SLang_Undo_Len++] = (unsigned char) SLang_Last_Key_Char; - SLang_Key_TimeOut_Flag = 0; + SLang_Key_TimeOut_Flag = 1; + SLang_Last_Key_Char = (*getkey)(); ++ SLang_Undo_Buffer [SLang_Undo_Len++] = (unsigned char) SLang_Last_Key_Char; + SLang_Key_TimeOut_Flag = 0; - len++; + len++; @@ -458,6 +466,8 @@ - kmax = next; + kmax = next; } + if (getkey == (int (*)(void)) SLang_getkey) @@ -63,14 +63,14 @@ diff -ur slang.old/src/slkeymap.c slang/src/slkeymap.c } diff -ur slang.old/src/slkeypad.c slang/src/slkeypad.c ---- slang.old/src/slkeypad.c Fri Apr 24 09:16:47 1998 -+++ slang/src/slkeypad.c Sat Jul 4 07:30:31 1998 +--- slang.old/src/slkeypad.c Fri Apr 24 09:16:47 1998 ++++ slang/src/slkeypad.c Sat Jul 4 07:30:31 1998 @@ -110,7 +110,7 @@ key = SLang_do_key (Keymap_List, (int (*)(void)) SLang_getkey); if ((key == NULL) || (key->type != SLKEY_F_KEYSYM)) { -- SLang_flush_input (); -+ /* SLang_flush_input (); */ - return SL_KEY_ERR; +- SLang_flush_input (); ++ /* SLang_flush_input (); */ + return SL_KEY_ERR; } diff --git a/contrib/sample.muttrc-tlr b/contrib/sample.muttrc-tlr index d3eff866f..59bdd8bd0 100644 --- a/contrib/sample.muttrc-tlr +++ b/contrib/sample.muttrc-tlr @@ -38,118 +38,118 @@ alternative_order text/plain text/html # A few of these may resemble Pine. ups. # -bind alias " " tag-entry -bind alias \n select-entry -bind alias \r select-entry - -bind attach i exit -bind attach n next-entry -bind attach p previous-entry -bind attach " " select-entry -bind attach y print-entry - -bind browser last-entry -bind browser first-entry - -bind editor "\e" kill-word -bind editor "\e" kill-word -bind editor "" complete-query -bind editor "\eq" complete-query -bind editor "\Ct" transpose-chars - -bind generic "\CV" next-page -bind generic "\Ca" first-entry -bind generic "\Ce" last-entry -bind generic "\eV" previous-page -bind generic "\ev" previous-page -bind generic + tag-entry -bind generic ^ first-entry -bind generic a tag-prefix -bind generic $ last-entry -bind generic q exit - -bind index ";" limit -bind index "\Ce" last-entry # override edit-type -bind index "\eV" previous-page # override collapse-something -bind index "\e<" collapse-thread -bind index "\eq" query -bind index $ last-entry -bind index * flag-message -bind index delete-message -bind index last-entry -bind index first-entry -bind index J next-entry -bind index K previous-entry -bind index Q quit -bind index R group-reply -bind index \em recall-message -bind index a tag-prefix -bind index m mail -bind index p previous-entry -bind index t create-alias -bind index x sync-mailbox -bind index y print-message -bind index n next-entry -bind index "\ev" previous-page - -bind pager "\Cn" next-line -bind pager "\Cp" previous-line -bind pager + tag-message -bind pager * flag-message -bind pager delete-message -bind pager next-line -bind pager bottom -bind pager top -bind pager previous-line -bind pager G group-reply -bind pager R group-reply -bind pager \em recall-message -bind pager t display-toggle-weed # like slrn -bind pager y print-message - -bind query i exit +bind alias " " tag-entry +bind alias \n select-entry +bind alias \r select-entry + +bind attach i exit +bind attach n next-entry +bind attach p previous-entry +bind attach " " select-entry +bind attach y print-entry + +bind browser last-entry +bind browser first-entry + +bind editor "\e" kill-word +bind editor "\e" kill-word +bind editor "" complete-query +bind editor "\eq" complete-query +bind editor "\Ct" transpose-chars + +bind generic "\CV" next-page +bind generic "\Ca" first-entry +bind generic "\Ce" last-entry +bind generic "\eV" previous-page +bind generic "\ev" previous-page +bind generic + tag-entry +bind generic ^ first-entry +bind generic a tag-prefix +bind generic $ last-entry +bind generic q exit + +bind index ";" limit +bind index "\Ce" last-entry # override edit-type +bind index "\eV" previous-page # override collapse-something +bind index "\e<" collapse-thread +bind index "\eq" query +bind index $ last-entry +bind index * flag-message +bind index delete-message +bind index last-entry +bind index first-entry +bind index J next-entry +bind index K previous-entry +bind index Q quit +bind index R group-reply +bind index \em recall-message +bind index a tag-prefix +bind index m mail +bind index p previous-entry +bind index t create-alias +bind index x sync-mailbox +bind index y print-message +bind index n next-entry +bind index "\ev" previous-page + +bind pager "\Cn" next-line +bind pager "\Cp" previous-line +bind pager + tag-message +bind pager * flag-message +bind pager delete-message +bind pager next-line +bind pager bottom +bind pager top +bind pager previous-line +bind pager G group-reply +bind pager R group-reply +bind pager \em recall-message +bind pager t display-toggle-weed # like slrn +bind pager y print-message + +bind query i exit # make it feel like emacs -macro generic "\ex" ":exec " -macro pager "\ex" ":exec " -macro generic "\eX" "\ex" -macro pager "\eX" "\ex" +macro generic "\ex" ":exec " +macro pager "\ex" ":exec " +macro generic "\eX" "\ex" +macro pager "\eX" "\ex" -macro index "~" ";~" -# macro index "%" ";%" +macro index "~" ";~" +# macro index "%" ";%" # Thread tagging -bind index "\et" tag-subthread -bind index "\eT" tag-thread +bind index "\et" tag-subthread +bind index "\eT" tag-thread # for majordomo list owner and moderator jobs -macro index "\ea" ":set nopipe_decode wait_key\n|approve\n:set nowait_key\n" -macro pager "\ea" ":set nopipe_decode wait_key\n|approve\n:set nowait_key\n" +macro index "\ea" ":set nopipe_decode wait_key\n|approve\n:set nowait_key\n" +macro pager "\ea" ":set nopipe_decode wait_key\n|approve\n:set nowait_key\n" # emulate the old URL-browser key bindings. -macro pager "\Cb" "| urlview -\n" -macro index "\Cb" "| urlview -\n" +macro pager "\Cb" "| urlview -\n" +macro index "\Cb" "| urlview -\n" # permit limiting from the pager. -macro pager "~" "~" -macro pager ";" "" +macro pager "~" "~" +macro pager ";" "" # emulate the old POP-feature bindings -macro index G "!fetchmail\n" -macro pager G "!fetchmail\n" +macro index G "!fetchmail\n" +macro pager G "!fetchmail\n" # razor-report: Report spam. -# macro index S ":set nopipe_decode nowait_key\n|razor-report > /dev/null 2> /dev/null\ns+junk\n" -# macro pager S ":set nopipe_decode nowait_key\n|razor-report > /dev/null 2> /dev/null\ns+junk\n" -macro index S "s+junk\n" -macro pager S "s+junk\n" +# macro index S ":set nopipe_decode nowait_key\n|razor-report > /dev/null 2> /dev/null\ns+junk\n" +# macro pager S ":set nopipe_decode nowait_key\n|razor-report > /dev/null 2> /dev/null\ns+junk\n" +macro index S "s+junk\n" +macro pager S "s+junk\n" # # Colors @@ -189,93 +189,93 @@ hdr_order from to cc date subject reply-to mail-followup-to list-id # Various settings # -set abort_nosubject=no # Let me send messages with an empty subject -set abort_unmodified=no # Let me send empty messages -set alias_file=~/.mutt/aliases # Where to store aliases -unset allow_8bit # Produce correct MIME -unset arrow_cursor # Use the bar cursor -set askcc # Ask me about CCs -unset bounce_delivered # Don't include Delivered-to with bounces -# set charset=iso-8859-1 # The local character set +set abort_nosubject=no # Let me send messages with an empty subject +set abort_unmodified=no # Let me send empty messages +set alias_file=~/.mutt/aliases # Where to store aliases +unset allow_8bit # Produce correct MIME +unset arrow_cursor # Use the bar cursor +set askcc # Ask me about CCs +unset bounce_delivered # Don't include Delivered-to with bounces +# set charset=iso-8859-1 # The local character set set send_charset="us-ascii:iso-8859-1:iso-8859-15:iso-8859-2:utf-8" -set confirmcreate # Ask me about creating new files -unset confirmappend # Don't ask me about appending to files -set delete=yes # Don't ask me whether or not I meant to delete messages +set confirmcreate # Ask me about creating new files +unset confirmappend # Don't ask me about appending to files +set delete=yes # Don't ask me whether or not I meant to delete messages # set display_filter="tr '\240\204\223\226' ' \"\"-'" # fix some funny characters -set edit_headers # I want to edit the headers. +set edit_headers # I want to edit the headers. set editor="/usr/bin/jed %s -f 'mail_mode();'" - # Invoke jed with mail_mode. This may - # or may not work for you. -set noenvelope_from # set messages' envelope-from header. -set fcc_clear # Store local copies of messages in the clear. -set folder=~/Mail # Where my mail folders go -set followup_to # Create Mail-Followup-To headers. -unset force_name # Don't create save folders which don't exist. -set forward_decode # Decode messages when forwarding. -set forward_decrypt # Decrypt messages when forwarding. -set nohelp # No help line. -set include=yes # Always include a copy when replying. -set mark_old # Distinguish between seen (but unread) and new messages -set mbox=+mbox # The (unused) mbox file. -unset metoo # Remove me from CC headers. -set mime_forward_rest=ask-no # Ask me whether or not to create a MIME-encapsulated forward -set move=no # Don't use mbox -set pager_stop # Don't fall through to the next message in the pager -set pager_index_lines=0 # The pager index is ugly. -set crypt_replyencrypt # Encrypt when replying to encrypted messages. -set crypt_replysignencrypted # Sign when replying to encrypted messages. -set pgp_show_unusable="no" # Don't display unusable keys. -set pgp_sort_keys="keyid" # Sort keys by key ID -set crypt_replysign # Sign when replying to signed messages. -set pgp_timeout=3600 # Forget the PGP passphrase after an hour. -set pipe_decode # Decode messages I pipe to commands, typically to patch(1). -set postponed=~/.mutt/postponed # Where to put postponed messages -set print=ask-no # Don't waste paper -set print_command="enscript -2Gr -Email" # Two columns, landscape, fancy header. -set print_split=yes # Invoke enscript once per message -set quit=yes # Don't ask me whether or not I want to quit. -set quote_regexp="^ *[a-zA-Z]*[>|][>:|]*" # Recognize quotes in the pager. -set read_inc=50 # Progress indicator when reading folders. -set recall=ask-no # When I say "compose", ask me whether I want to continue - # composing a postponed message. -set record="+archive/now" # Put copies of most outgoing messages to ~/Mail/archive/now -set reply_to=ask-yes # Ask me whether I want to honor users' reply-to headers. -set reverse_alias # Use aliases to display real names on the index. -set save_name # Save copies by name. Together with $record and $save_name, - # this means that when a folder exists, copies of outgoing - # messages are written to ~/Mail/, otherwise they go to - # ~/Mail/archive/now -set signature=~/.signature # Silly signature -set sig_dashes # Add dashes above my signature -set smart_wrap # Try to be smart when wrapping around lines in the pager -set sort=threads # sort by threads, -set sort_aux=date # then by date -unset strict_threads # don't be strict about threads -# set suspend=no # Don't suspend - I usually run mutt like this: "xterm -e mutt" -set tilde # Indicate empty lines in the pager. -set tmpdir=~/.tmp # Temporary files aren't stored in public places. -set to_chars=" +TCF " # Don't tag list mail in the index - -unset use_domain # Don't append a domain to addresses. - -set write_inc=50 # Progress indicator when writing folders. -set query_command="lbdb2q.pl %s" # Use the Little Brother's Database with the external - # query feature. -set sendmail_wait=-1 # Don't put sendmail into the background. -set encode_from # "From " in the beginning of a line triggers quoted-printable -set nowait_key # Return immediately from external programs -set forward_format="[fwd] %s (from: %a)" # A different subject for forwarded messages -set nobeep # Shut up. ;-) -set reply_regexp="^((re([\\[0-9\\]+])*|aw):[ \t]*)+[ \t]*" # A regular expression to detect replies -set header # Include the message header when replying. -set ignore_list_reply_to # Ignore Reply-To headers pointing to mailing lists. -set norfc2047_parameters # Sometimes, I get mails which use a bogus encoding for - # MIME parameters. Setting this shouldn't harm. - # (OK, she doesn't use Notes any more, so I can unset this. ;-) -# set text_flowed # Generate text/plain; format=flowed -# unset use_ipv6 # Don't try to use IPv6 - it doesn't work here. -set keep_flagged # don't move flagged messages to mbox -set hide_missing=yes # Don't show how many messages are missing in a thread structure + # Invoke jed with mail_mode. This may + # or may not work for you. +set noenvelope_from # set messages' envelope-from header. +set fcc_clear # Store local copies of messages in the clear. +set folder=~/Mail # Where my mail folders go +set followup_to # Create Mail-Followup-To headers. +unset force_name # Don't create save folders which don't exist. +set forward_decode # Decode messages when forwarding. +set forward_decrypt # Decrypt messages when forwarding. +set nohelp # No help line. +set include=yes # Always include a copy when replying. +set mark_old # Distinguish between seen (but unread) and new messages +set mbox=+mbox # The (unused) mbox file. +unset metoo # Remove me from CC headers. +set mime_forward_rest=ask-no # Ask me whether or not to create a MIME-encapsulated forward +set move=no # Don't use mbox +set pager_stop # Don't fall through to the next message in the pager +set pager_index_lines=0 # The pager index is ugly. +set crypt_replyencrypt # Encrypt when replying to encrypted messages. +set crypt_replysignencrypted # Sign when replying to encrypted messages. +set pgp_show_unusable="no" # Don't display unusable keys. +set pgp_sort_keys="keyid" # Sort keys by key ID +set crypt_replysign # Sign when replying to signed messages. +set pgp_timeout=3600 # Forget the PGP passphrase after an hour. +set pipe_decode # Decode messages I pipe to commands, typically to patch(1). +set postponed=~/.mutt/postponed # Where to put postponed messages +set print=ask-no # Don't waste paper +set print_command="enscript -2Gr -Email" # Two columns, landscape, fancy header. +set print_split=yes # Invoke enscript once per message +set quit=yes # Don't ask me whether or not I want to quit. +set quote_regexp="^ *[a-zA-Z]*[>|][>:|]*" # Recognize quotes in the pager. +set read_inc=50 # Progress indicator when reading folders. +set recall=ask-no # When I say "compose", ask me whether I want to continue + # composing a postponed message. +set record="+archive/now" # Put copies of most outgoing messages to ~/Mail/archive/now +set reply_to=ask-yes # Ask me whether I want to honor users' reply-to headers. +set reverse_alias # Use aliases to display real names on the index. +set save_name # Save copies by name. Together with $record and $save_name, + # this means that when a folder exists, copies of outgoing + # messages are written to ~/Mail/, otherwise they go to + # ~/Mail/archive/now +set signature=~/.signature # Silly signature +set sig_dashes # Add dashes above my signature +set smart_wrap # Try to be smart when wrapping around lines in the pager +set sort=threads # sort by threads, +set sort_aux=date # then by date +unset strict_threads # don't be strict about threads +# set suspend=no # Don't suspend - I usually run mutt like this: "xterm -e mutt" +set tilde # Indicate empty lines in the pager. +set tmpdir=~/.tmp # Temporary files aren't stored in public places. +set to_chars=" +TCF " # Don't tag list mail in the index + +unset use_domain # Don't append a domain to addresses. + +set write_inc=50 # Progress indicator when writing folders. +set query_command="lbdb2q.pl %s" # Use the Little Brother's Database with the external + # query feature. +set sendmail_wait=-1 # Don't put sendmail into the background. +set encode_from # "From " in the beginning of a line triggers quoted-printable +set nowait_key # Return immediately from external programs +set forward_format="[fwd] %s (from: %a)" # A different subject for forwarded messages +set nobeep # Shut up. ;-) +set reply_regexp="^((re([\\[0-9\\]+])*|aw):[ \t]*)+[ \t]*" # A regular expression to detect replies +set header # Include the message header when replying. +set ignore_list_reply_to # Ignore Reply-To headers pointing to mailing lists. +set norfc2047_parameters # Sometimes, I get mails which use a bogus encoding for + # MIME parameters. Setting this shouldn't harm. + # (OK, she doesn't use Notes any more, so I can unset this. ;-) +# set text_flowed # Generate text/plain; format=flowed +# unset use_ipv6 # Don't try to use IPv6 - it doesn't work here. +set keep_flagged # don't move flagged messages to mbox +set hide_missing=yes # Don't show how many messages are missing in a thread structure set status_format="-%r-+(%v) %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]----%>-(%P)---" set compose_format="--+(%v) Compose [Approx. msg size: %l Atts: %a]%>-" @@ -284,8 +284,8 @@ set pager_format="-%Z- %C/%m: %.20n %> %s" set smileys="^$" set ispell=iaspell -set markers=no # Don't mark wrapped lines -set wrapmargin=4 # Leave a margin in the pager +set markers=no # Don't mark wrapped lines +set wrapmargin=4 # Leave a margin in the pager # PGP command configuration # source ~/.mutt/pgp2.rc diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt index 43be2d289..2215c4104 100644 --- a/doc/PGP-Notes.txt +++ b/doc/PGP-Notes.txt @@ -1,4 +1,4 @@ - USING PGP FROM WITHIN MUTT + USING PGP FROM WITHIN MUTT WARNING: The configuration interface has completely changed as of @@ -6,7 +6,7 @@ WARNING: The configuration interface has completely changed as of - USERS' GUIDE + USERS' GUIDE How do I use mutt with PGP, PGP5, or GnuPG? @@ -40,7 +40,7 @@ The old way is to configure your mail filter so it fixes headers: Add the following lines to your ~/.procmailrc (you are using procmail, aren't you?): - ------------------------------ + ------------------------------ ## ## PGP @@ -66,12 +66,12 @@ using procmail, aren't you?): } - ------------------------------ + ------------------------------ For users of maildrop, "Mark Weinem" suggests the following recipe: - ------------------------------ + ------------------------------ BPGPM="-----BEGIN PGP MESSAGE-----" EPGPM="-----END PGP MESSAGE-----" @@ -79,18 +79,18 @@ BPGPS="-----BEGIN PGP SIGNATURE-----" EPGPS="-----END PGP SIGNATURE-----" if (!/^Content-Type: message/ && !/^Content-Type: multipart/ \ - && !/^Content-Type: application\/pgp/) + && !/^Content-Type: application\/pgp/) { if (/^$BPGPM/:b && /^$EPGPM/:b) - xfilter "reformail -A 'Content-Type: application/pgp; format=text; \ - x-action=encrypt'" + xfilter "reformail -A 'Content-Type: application/pgp; format=text; \ + x-action=encrypt'" if (/^$BPGPS/:b && /^$EPGPS/:b) - xfilter "reformail -A 'Content-Type: application/pgp; format=text; \ - x-action=sign'" + xfilter "reformail -A 'Content-Type: application/pgp; format=text; \ + x-action=sign'" } - ------------------------------ + ------------------------------ @@ -107,8 +107,8 @@ The old answer to this question used to be this: this is actually one line): macro compose S "Fpgp +verbose=0 -fast - +clearsig=on\ny^T^Uapplication/pgp; format=text; - x-action=sign\n" + +clearsig=on\ny^T^Uapplication/pgp; format=text; + x-action=sign\n" There's a new answer, though: Set the $pgp_autoinline @@ -151,7 +151,7 @@ or exim. - BACKGROUND + BACKGROUND Auxiliary Programs @@ -172,17 +172,17 @@ You'll need this program with PGP 2 and PGP 5. Command line options: - -k Dump the contents of the key ring specified - as an argument to -k. + -k Dump the contents of the key ring specified + as an argument to -k. - -2, -5 Use the default key ring for PGP 2 or 5, - respectively. + -2, -5 Use the default key ring for PGP 2 or 5, + respectively. - -s Dump the secret key ring. + -s Dump the secret key ring. - -S Dump signatures. + -S Dump signatures. - -f Dump fingerprints. + -f Dump fingerprints. @@ -196,11 +196,11 @@ arguments. Example: - pgpewrap pgpe file -- -r a b c + pgpewrap pgpe file -- -r a b c will execute: - pgpe file -r a -r b -r c + pgpe file -r a -r b -r c This script is needed with PGP 5 and with GPG, since their command line interfaces can't be properly served by mutt's format mechanism. @@ -214,57 +214,57 @@ As usual within mutt, the configuration interface for the PGP commands relies on printf-like formats. For all PGP commands, the following %-sequences are defined. - %p The empty string when no passphrase is needed, - the string "PGPPASSFD=0" if one is needed. + %p The empty string when no passphrase is needed, + the string "PGPPASSFD=0" if one is needed. - This is mostly used in conditional % sequences. + This is mostly used in conditional % sequences. - %f Most PGP commands operate on a single file or a file - containing a message. %f expands to this file's name. + %f Most PGP commands operate on a single file or a file + containing a message. %f expands to this file's name. - %s When verifying signatures, there is another temporary file - containing the detached signature. %s expands to this - file's name. + %s When verifying signatures, there is another temporary file + containing the detached signature. %s expands to this + file's name. - %a In "signing" contexts, this expands to the value of the - configuration variable $pgp_sign_as. You probably need to - use this within a conditional % sequence. + %a In "signing" contexts, this expands to the value of the + configuration variable $pgp_sign_as. You probably need to + use this within a conditional % sequence. - %r In many contexts, mutt passes key IDs to pgp. %r expands to - a list of key IDs. + %r In many contexts, mutt passes key IDs to pgp. %r expands to + a list of key IDs. The following command formats are defined: - $pgp_decode_command Decode application/pgp messages. This - command operates with and without pass phrases. + $pgp_decode_command Decode application/pgp messages. This + command operates with and without pass phrases. - $pgp_verify_command Verify a PGP/MIME signature. + $pgp_verify_command Verify a PGP/MIME signature. - $pgp_decrypt_command Decrypt a PGP/MIME encrypted MIME body. - This command always gets a pass phrase. + $pgp_decrypt_command Decrypt a PGP/MIME encrypted MIME body. + This command always gets a pass phrase. - $pgp_sign_command Sign a PGP/MIME body. This command always - gets a pass phrase. + $pgp_sign_command Sign a PGP/MIME body. This command always + gets a pass phrase. $pgp_encrypt_sign_command Encrypt and sign a MIME body. This - command always gets a pass phrase. + command always gets a pass phrase. $pgp_encrypt_only_command Encrypt a MIME body, but don't sign it. - $pgp_import_command Import PGP keys from a file. + $pgp_import_command Import PGP keys from a file. - $pgp_export_command Export PGP keys to a file. The output must - be ASCII armored. + $pgp_export_command Export PGP keys to a file. The output must + be ASCII armored. $pgp_verify_key_command Check a public key. This is used from the - key selection menu. + key selection menu. $pgp_list_secring_command List the secret keys matching some hints - given in %r. + given in %r. $pgp_list_pubring_command List the public keys matching some hints - given in %r. + given in %r. The passphrase is always passed on stdin; all commands must send their output to stdout and stderr. diff --git a/doc/instdoc.sh.in b/doc/instdoc.sh.in deleted file mode 100644 index 999f6f612..000000000 --- a/doc/instdoc.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -- - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -mandir=@mandir@ -srcdir=@srcdir@ -datarootdir=@datarootdir@ -docdir=@docdir@ -includedir=@includedir@ -top_srcdir=@top_srcdir@ -top_builddir=.. - -SOURCE="$1" -TARGET="$2" - - -rm -f "$TARGET" - -sed -e "s;/usr/local/bin/;$bindir/;g" \ - -e "s;/usr/local/doc/mutt/;$docdir/;g" \ - "$SOURCE" > $TARGET - -chmod 644 "$TARGET" diff --git a/doc/mutt-1.7.0-syntax.vim b/doc/mutt-1.7.0-syntax.vim index a7b422c03..6303688e9 100644 --- a/doc/mutt-1.7.0-syntax.vim +++ b/doc/mutt-1.7.0-syntax.vim @@ -644,7 +644,7 @@ hi def link muttrcAddrDef muttrcGroupFlag hi def link muttrcRXDef muttrcGroupFlag hi def link muttrcRXPat String hi def link muttrcAliasGroupName Macro -hi def link muttrcAliasKey Identifier +hi def link muttrcAliasKey Identifier hi def link muttrcUnAliasKey Identifier hi def link muttrcAliasEncEmail Identifier hi def link muttrcAliasParens Type diff --git a/doc/neomutt-syntax.vim b/doc/neomutt-syntax.vim index 3e128621a..30beb88d2 100644 --- a/doc/neomutt-syntax.vim +++ b/doc/neomutt-syntax.vim @@ -644,7 +644,7 @@ hi def link muttrcAddrDef muttrcGroupFlag hi def link muttrcRXDef muttrcGroupFlag hi def link muttrcRXPat String hi def link muttrcAliasGroupName Macro -hi def link muttrcAliasKey Identifier +hi def link muttrcAliasKey Identifier hi def link muttrcUnAliasKey Identifier hi def link muttrcAliasEncEmail Identifier hi def link muttrcAliasParens Type