Changeset 4745:233524ae54e3

Timestamp:

2006-07-19 17:12:51 (2 years ago)

Author:

Alain Bench <veronatif@…>

Branch:

HEAD

Message:

Clean up a number of examples in the documentation.

Files:

• Muttrc.head.in (modified) (1 diff)
• contrib/Mush.rc (modified) (1 diff)
• contrib/Pine.rc (modified) (1 diff)
• contrib/Tin.rc (modified) (1 diff)
• contrib/sample.muttrc (modified) (6 diffs)
• contrib/sample.muttrc-tlr (modified) (1 diff)
• doc/muttrc.man.head (modified) (1 diff)

Muttrc.head.in

@@ -12 +12 @@
 
 # simulate the old url menu
-macro index,pager \cb "<pipe-message>urlview<Enter>" "call urlview to extract URLs out of a message"
+macro index,pager \cb "<pipe-message> urlview<Enter>" "call urlview to extract URLs out of a message"
+macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
 
 # Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape>less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
 
 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"

contrib/Mush.rc

@@ -7 +7 @@
 bind index . display-message
 bind index t display-message
-macro index n j\n
+macro index n "<next-entry><display-message>"
 bind index + next-entry
 bind index j next-entry

contrib/Pine.rc

@@ -22 +22 @@
 
 # Not possible to simulate zoom-out...
-macro index z l~T\r
+macro index z "<limit>~T<Enter>"
 
 bind pager p previous-undeleted

contrib/Tin.rc

@@ -16 +16 @@
 bind  attach  <right>  view-attach
 bind  index   <right>  display-message
-macro index   <left>   "c?"
+macro index   <left>   "<change-folder>?"
 bind  browser <right>  select-entry
-macro browser <left>   "qc!\r"
+macro browser <left>   "<exit><change-folder>!<Enter>"
 
 

contrib/sample.muttrc

@@ -41 +41 @@
 #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
@@ -105 +105 @@
 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
@@ -177 +177 @@
 bind generic \177 last-entry
 
-macro index \cb |urlview\n      # simulate the old browse-url function
-
-macro index S s+spam\n
-macro pager S s+spam\n
-
-#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 \cb "<pipe-message> urlview<Enter>" # simulate the old browse-url function
+
+macro index S "<save-message>+spam<Enter>"
+macro pager S "<save-message>+spam<Enter>"
+
+#macro index \# "<search>bug<Enter>"    # search for bugs
+#macro index "\""       "<enter-command> set realname=\"real hairy macro\" ?realname<Enter>" # and a comment to boot!
+#macro index f1 "<enter-command>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     "<pipe-message> pgp -kaf<Enter>"   # a comment is valid here
+#macro pager X "<pipe-message> morepgp<Enter>"  # pipe PGP message to a script
 
 #bind editor \cy eol    # make ^Y jump to the end of the line
@@ -209 +209 @@
 
 #save-hook mutt- =mutt-mail
-#save-hook aol\.com +spam
+#save-hook aol\\.com$ +spam
 save-hook ^judge +diplomacy
 
@@ -253 +253 @@
 # <command> is executed when opening a mailbox matching <pattern>
 
-#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 reply_regexp="^re:[ \t]*"'
+#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]*"'
 
 # 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]*"'
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -303 +304 @@
 #       lists <list-name> [ <list-name> ... ]
 
-lists mutt-dev mutt-users
+lists ^mutt-dev@mutt\\.org$ ^mutt-users@mutt\\.org$
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

contrib/sample.muttrc-tlr

@@ -105 +105 @@
 # 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"           "<enter-command>exec "
+macro   generic,pager   "\eX"           "\ex"
+macro   index           "~"             "<limit>~"
 
 # move messages to the pilot folder
 
-macro   index   "\ew"           "<decode-copy>+pilot\n" "Copy a message to the pilot folder."
-macro   pager   "\ew"           "<decode-copy>+pilot\n" "Copy a message to the pilot folder."
+macro   index,pager     "\ew"           "<decode-copy>+pilot<Enter>"    "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"           "\
+<enter-command> set nopipe_decode wait_key<Enter>\
+<pipe-message> approve<Enter>\
+<enter-command> set nowait_key<Enter>"
 
 # emulate the old URL-browser key bindings.
 
-macro   pager   "\Cb"   "| urlview -\n"
-macro   index   "\Cb"   "| urlview -\n"
+macro   index,pager     "\Cb"   "<pipe-message> urlview -<Enter>"
 
 # permit limiting from the pager.
 
-macro   pager   ";"     "<exit><limit>"
+macro   pager   ";"     "<exit><limit>"
+macro   pager   "~"     "<exit><limit>~"
 
 # emulate the old POP-feature bindings
 
-macro   index   G       "!fetchmail\n"  
-macro   pager   G       "!fetchmail\n"
-
-macro   compose "\ee"   "Fpgp -eatf " 
+macro   index,pager     G       "<shell-escape> fetchmail<Enter>"
+
+macro   compose "\ee"   "<filter-entry>pgp -eatf "
 
 

doc/muttrc.man.head

@@ -322 +322 @@
 .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 [ ... ]