Clean up a number of examples in the documentation.

+3 -2

Muttrc.head.in

··· 11 11 macro index \eb "<search>~b " "search in message bodies" 12 12 13 13 # simulate the old url menu 14 - macro index,pager \cb "<pipe-message>urlview<Enter>" "call urlview to extract URLs out of a message" 14 + macro index,pager \cb "<pipe-message> urlview<Enter>" "call urlview to extract URLs out of a message" 15 + macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message" 15 16 16 17 # Show documentation when pressing F1 17 - macro generic,pager <F1> "<shell-escape>less @docdir@/manual.txt<Enter>" "show Mutt documentation" 18 + macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation" 18 19 19 20 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" 20 21 macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"

+1 -1

contrib/Mush.rc

··· 6 6 7 7 bind index . display-message 8 8 bind index t display-message 9 - macro index n j\n 9 + macro index n "<next-entry><display-message>" 10 10 bind index + next-entry 11 11 bind index j next-entry 12 12 bind index J next-entry

+1 -1

contrib/Pine.rc

··· 21 21 bind index \; tag-entry 22 22 23 23 # Not possible to simulate zoom-out... 24 - macro index z l~T\r 24 + macro index z "<limit>~T<Enter>" 25 25 26 26 bind pager p previous-undeleted 27 27 bind pager n next-undeleted

+2 -2

contrib/Tin.rc

··· 15 15 bind attach <left> exit 16 16 bind attach <right> view-attach 17 17 bind index <right> display-message 18 - macro index <left> "c?" 18 + macro index <left> "<change-folder>?" 19 19 bind browser <right> select-entry 20 - macro browser <left> "qc!\r" 20 + macro browser <left> "<exit><change-folder>!<Enter>" 21 21 22 22

+19 -18

contrib/sample.muttrc

··· 40 40 #set forward_decode # weed and MIME decode forwaded messages 41 41 #set forward_format="[%a: %s]" # subject to use when forwarding messages 42 42 #set forward_quote # quote the header and body of forward msgs 43 - #set hdr_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s" 44 - set hdr_format="%4C %Z %{%m/%d} %-15.15F (%4c) %s" # format of the index 43 + #set index_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s" 44 + set index_format="%4C %Z %{%m/%d} %-15.15F (%4c) %s" # format of the index 45 45 #set hdrs # include `my_hdr' lines in outgoing messages 46 46 #set header # include message header when replying 47 47 set help # show the help lines ··· 104 104 #set use_8bitmime # enable the -B8BITMIME sendmail flag 105 105 set nouse_domain # don't qualify local addresses with $domain 106 106 #set use_from # always generate the `From:' header field 107 - set use_mailcap=yes # always use a mailcap entry when found 107 + set implicit_autoview=yes # pager shows parts having a mailcap viewer 108 108 set pgp_verify_sig=no # don't automatically verify message signatures 109 109 #set visual=vim # editor invoked by ~v in the builtin editor 110 110 #set nowait_key # prompt when a pipe returns normal status ··· 176 176 bind generic } bottom-page 177 177 bind generic \177 last-entry 178 178 179 - macro index \cb |urlview\n # simulate the old browse-url function 179 + macro index \cb "<pipe-message> urlview<Enter>" # simulate the old browse-url function 180 180 181 - macro index S s+spam\n 182 - macro pager S s+spam\n 181 + macro index S "<save-message>+spam<Enter>" 182 + macro pager S "<save-message>+spam<Enter>" 183 183 184 - #macro index \# /bug^M # search for bugs 185 - #macro index "\"" ":set realname=\"real hairy macro\"^M:set ?realname^M" # and a comment to boot! 186 - #macro index f1 :woohoo! 184 + #macro index \# "<search>bug<Enter>" # search for bugs 185 + #macro index "\"" "<enter-command> set realname=\"real hairy macro\" ?realname<Enter>" # and a comment to boot! 186 + #macro index f1 "<enter-command>woohoo!" 187 187 188 188 bind pager G bottom # just like vi and less 189 - #macro pager \Ck "|pgp -kaf^M" # a comment is valid here 190 - #macro pager X "|morepgp^M" # pipe PGP message to a script 189 + #macro pager \Ck "<pipe-message> pgp -kaf<Enter>" # a comment is valid here 190 + #macro pager X "<pipe-message> morepgp<Enter>" # pipe PGP message to a script 191 191 192 192 #bind editor \cy eol # make ^Y jump to the end of the line 193 193 ··· 208 208 # <mailbox> is provided as default when saving messages from <pattern> 209 209 210 210 #save-hook mutt- =mutt-mail 211 - #save-hook aol\.com +spam 211 + #save-hook aol\\.com$ +spam 212 212 save-hook ^judge +diplomacy 213 213 214 214 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ··· 252 252 # 253 253 # <command> is executed when opening a mailbox matching <pattern> 254 254 255 - #folder-hook . 'set sort=date-sent' 256 - #folder-hook mutt 'set hdr_format="%4C %Z %02m/%02N %-20.20F (%4l) %s"' 257 - #folder-hook =mutt my_hdr Revolution: \#9 # real comment 255 + #folder-hook . 'set sort=date-sent' 256 + #folder-hook mutt 'set index_format="%4C %Z %02m/%02N %-20.20F (%4l) %s"' 257 + #folder-hook =mutt my_hdr Revolution: \#9 # real comment 258 258 259 - #folder-hook . 'set reply_regexp="^re:[ \t]*"' 259 + #folder-hook . 'set reply_regexp="^re:[ \t]*"' 260 260 261 261 # this mailing list prepends "[WM]" to all non reply subjects, so set 262 262 # $reply_regexp to ignore it 263 - #folder-hook +wmaker 'set reply_regexp="^(re:[ \t]*)?\[WM\][ \t]*"' 263 + # Warning: May break threads for other people. 264 + #folder-hook +wmaker 'set reply_regexp="^(re:[ \t]*)?\[WM\][ \t]*"' 264 265 265 266 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 266 267 # ··· 302 303 # 303 304 # lists <list-name> [ <list-name> ... ] 304 305 305 - lists mutt-dev mutt-users 306 + lists ^mutt-dev@mutt\\.org$ ^mutt-users@mutt\\.org$ 306 307 307 308 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 308 309 #

+13 -15

contrib/sample.muttrc-tlr

··· 104 104 105 105 # make it feel like emacs 106 106 107 - macro generic "\ex" ":exec " 108 - macro pager "\ex" ":exec " 109 - macro generic "\eX" "\ex" 110 - macro pager "\eX" "\ex" 111 - macro index "~" ";~" 107 + macro generic,pager "\ex" "<enter-command>exec " 108 + macro generic,pager "\eX" "\ex" 109 + macro index "~" "<limit>~" 112 110 113 111 # move messages to the pilot folder 114 112 115 - macro index "\ew" "<decode-copy>+pilot\n" "Copy a message to the pilot folder." 116 - macro pager "\ew" "<decode-copy>+pilot\n" "Copy a message to the pilot folder." 113 + macro index,pager "\ew" "<decode-copy>+pilot<Enter>" "Copy a message to the pilot folder." 117 114 118 115 # for majordomo list owner and moderator jobs 119 116 120 - macro index "\ea" ":set nopipe_decode wait_key\n|approve\n:set nowait_key\n" 121 - macro pager "\ea" ":set nopipe_decode wait_key\n|approve\n:set nowait_key\n" 117 + macro index,pager "\ea" "\ 118 + <enter-command> set nopipe_decode wait_key<Enter>\ 119 + <pipe-message> approve<Enter>\ 120 + <enter-command> set nowait_key<Enter>" 122 121 123 122 # emulate the old URL-browser key bindings. 124 123 125 - macro pager "\Cb" "| urlview -\n" 126 - macro index "\Cb" "| urlview -\n" 124 + macro index,pager "\Cb" "<pipe-message> urlview -<Enter>" 127 125 128 126 # permit limiting from the pager. 129 127 130 - macro pager ";" "<exit><limit>" 128 + macro pager ";" "<exit><limit>" 129 + macro pager "~" "<exit><limit>~" 131 130 132 131 # emulate the old POP-feature bindings 133 132 134 - macro index G "!fetchmail\n" 135 - macro pager G "!fetchmail\n" 133 + macro index,pager G "<shell-escape> fetchmail<Enter>" 136 134 137 - macro compose "\ee" "Fpgp -eatf " 135 + macro compose "\ee" "<filter-entry>pgp -eatf " 138 136 139 137 140 138 #

+1 -1

doc/muttrc.man.head

··· 321 321 This command adds the named \fIstring\fP to the keyboard buffer. 322 322 .PP 323 323 .nf 324 - \fBset\fP [\fBno\fP|\fBinv\fP]\fIvariable\fP[=\fIvalue\fP] [ ... ] 324 + \fBset\fP [\fBno\fP|\fBinv\fP|\fB&\fP|\fB?\fP]\fIvariable\fP[=\fIvalue\fP] [ ... ] 325 325 \fBtoggle\fP \fIvariable\fP [ ... ] 326 326 \fBunset\fP \fIvariable\fP [ ... ] 327 327 \fBreset\fP \fIvariable\fP [ ... ]