From: Alain Bench Date: Thu, 20 Jul 2006 00:12:51 +0000 (+0000) Subject: Clean up a number of examples in the documentation. X-Git-Tag: mutt-1-5-13-rel~64 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8ec14c8cfa4752ea04f29143995bc1e4e4a1a75;p=mutt Clean up a number of examples in the documentation. --- diff --git a/Muttrc.head.in b/Muttrc.head.in index 93730726..a01449bc 100644 --- a/Muttrc.head.in +++ b/Muttrc.head.in @@ -11,10 +11,11 @@ ignore sender references return-path lines macro index \eb "~b " "search in message bodies" # simulate the old url menu -macro index,pager \cb "urlview" "call urlview to extract URLs out of a message" +macro index,pager \cb " urlview" "call urlview to extract URLs out of a message" +macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" # Show documentation when pressing F1 -macro generic,pager "less @docdir@/manual.txt" "show Mutt documentation" +macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" diff --git a/contrib/Mush.rc b/contrib/Mush.rc index 630ee0d2..cdbb4ded 100644 --- a/contrib/Mush.rc +++ b/contrib/Mush.rc @@ -6,7 +6,7 @@ bind index . display-message bind index t display-message -macro index n j\n +macro index n "" bind index + next-entry bind index j next-entry bind index J next-entry diff --git a/contrib/Pine.rc b/contrib/Pine.rc index 94d90e13..b0deea16 100644 --- a/contrib/Pine.rc +++ b/contrib/Pine.rc @@ -21,7 +21,7 @@ bind index a tag-prefix bind index \; tag-entry # Not possible to simulate zoom-out... -macro index z l~T\r +macro index z "~T" bind pager p previous-undeleted bind pager n next-undeleted diff --git a/contrib/Tin.rc b/contrib/Tin.rc index 8f8b1de4..e0ad010f 100644 --- a/contrib/Tin.rc +++ b/contrib/Tin.rc @@ -15,8 +15,8 @@ bind pager view-attachments bind attach exit bind attach view-attach bind index display-message -macro index "c?" +macro index "?" bind browser select-entry -macro browser "qc!\r" +macro browser "!" diff --git a/contrib/sample.muttrc b/contrib/sample.muttrc index 55780b61..07dbe179 100644 --- a/contrib/sample.muttrc +++ b/contrib/sample.muttrc @@ -40,8 +40,8 @@ set edit_headers # let me edit the message header when composing #set forward_decode # weed and MIME decode forwaded messages #set forward_format="[%a: %s]" # subject to use when forwarding messages #set forward_quote # quote the header and body of forward msgs -#set hdr_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s" -set hdr_format="%4C %Z %{%m/%d} %-15.15F (%4c) %s" # format of the index +#set index_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s" +set index_format="%4C %Z %{%m/%d} %-15.15F (%4c) %s" # format of the index #set hdrs # include `my_hdr' lines in outgoing messages #set header # include message header when replying set help # show the help lines @@ -104,7 +104,7 @@ set tilde # virtual lines to pad blank lines in the pager #set use_8bitmime # enable the -B8BITMIME sendmail flag set nouse_domain # don't qualify local addresses with $domain #set use_from # always generate the `From:' header field -set use_mailcap=yes # always use a mailcap entry when found +set implicit_autoview=yes # pager shows parts having a mailcap viewer set pgp_verify_sig=no # don't automatically verify message signatures #set visual=vim # editor invoked by ~v in the builtin editor #set nowait_key # prompt when a pipe returns normal status @@ -176,18 +176,18 @@ bind generic { top-page bind generic } bottom-page bind generic \177 last-entry -macro index \cb |urlview\n # simulate the old browse-url function +macro index \cb " urlview" # simulate the old browse-url function -macro index S s+spam\n -macro pager S s+spam\n +macro index S "+spam" +macro pager S "+spam" -#macro index \# /bug^M # search for bugs -#macro index "\"" ":set realname=\"real hairy macro\"^M:set ?realname^M" # and a comment to boot! -#macro index f1 :woohoo! +#macro index \# "bug" # search for bugs +#macro index "\"" " set realname=\"real hairy macro\" ?realname" # and a comment to boot! +#macro index f1 "woohoo!" bind pager G bottom # just like vi and less -#macro pager \Ck "|pgp -kaf^M" # a comment is valid here -#macro pager X "|morepgp^M" # pipe PGP message to a script +#macro pager \Ck " pgp -kaf" # a comment is valid here +#macro pager X " morepgp" # pipe PGP message to a script #bind editor \cy eol # make ^Y jump to the end of the line @@ -208,7 +208,7 @@ bind pager G bottom # just like vi and less # is provided as default when saving messages from #save-hook mutt- =mutt-mail -#save-hook aol\.com +spam +#save-hook aol\\.com$ +spam save-hook ^judge +diplomacy # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -252,15 +252,16 @@ save-hook ^judge +diplomacy # # is executed when opening a mailbox matching -#folder-hook . 'set sort=date-sent' -#folder-hook mutt 'set hdr_format="%4C %Z %02m/%02N %-20.20F (%4l) %s"' -#folder-hook =mutt my_hdr Revolution: \#9 # real comment +#folder-hook . 'set sort=date-sent' +#folder-hook mutt 'set index_format="%4C %Z %02m/%02N %-20.20F (%4l) %s"' +#folder-hook =mutt my_hdr Revolution: \#9 # real comment -#folder-hook . 'set reply_regexp="^re:[ \t]*"' +#folder-hook . 'set reply_regexp="^re:[ \t]*"' # this mailing list prepends "[WM]" to all non reply subjects, so set # $reply_regexp to ignore it -#folder-hook +wmaker 'set reply_regexp="^(re:[ \t]*)?\[WM\][ \t]*"' +# Warning: May break threads for other people. +#folder-hook +wmaker 'set reply_regexp="^(re:[ \t]*)?\[WM\][ \t]*"' # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -302,7 +303,7 @@ hdr_order date from subject to cc # # lists [ ... ] -lists mutt-dev mutt-users +lists ^mutt-dev@mutt\\.org$ ^mutt-users@mutt\\.org$ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # diff --git a/contrib/sample.muttrc-tlr b/contrib/sample.muttrc-tlr index 4e2959ad..7c8d3816 100644 --- a/contrib/sample.muttrc-tlr +++ b/contrib/sample.muttrc-tlr @@ -104,37 +104,35 @@ 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 index "~" ";~" +macro generic,pager "\ex" "exec " +macro generic,pager "\eX" "\ex" +macro index "~" "~" # move messages to the pilot folder -macro index "\ew" "+pilot\n" "Copy a message to the pilot folder." -macro pager "\ew" "+pilot\n" "Copy a message to the pilot folder." +macro index,pager "\ew" "+pilot" "Copy a message to the pilot folder." # 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,pager "\ea" "\ + set nopipe_decode wait_key\ + approve\ + set nowait_key" # emulate the old URL-browser key bindings. -macro pager "\Cb" "| urlview -\n" -macro index "\Cb" "| urlview -\n" +macro index,pager "\Cb" " urlview -" # permit limiting from the 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,pager G " fetchmail" -macro compose "\ee" "Fpgp -eatf " +macro compose "\ee" "pgp -eatf " # diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head index ff25172b..1a5ba27c 100644 --- a/doc/muttrc.man.head +++ b/doc/muttrc.man.head @@ -321,7 +321,7 @@ or even just an arbitrary search string. This command adds the named \fIstring\fP to the keyboard buffer. .PP .nf -\fBset\fP [\fBno\fP|\fBinv\fP]\fIvariable\fP[=\fIvalue\fP] [ ... ] +\fBset\fP [\fBno\fP|\fBinv\fP|\fB&\fP|\fB?\fP]\fIvariable\fP[=\fIvalue\fP] [ ... ] \fBtoggle\fP \fIvariable\fP [ ... ] \fBunset\fP \fIvariable\fP [ ... ] \fBreset\fP \fIvariable\fP [ ... ]