From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 30 Aug 2001 21:00:51 +0000 (+0000)
Subject: update
X-Git-Tag: mutt-1-3-22-rel~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6851684355acbc90f9d3f746424510caa1110b30;p=mutt

update
---

diff --git a/contrib/sample.muttrc-tlr b/contrib/sample.muttrc-tlr
index fa494211..4e2959ad 100644
--- a/contrib/sample.muttrc-tlr
+++ b/contrib/sample.muttrc-tlr
@@ -23,7 +23,7 @@ auto_view text/html application/x-gzip application/x-gunzip
 auto_view application/rtf application/x-rath
 auto_view application/msword
 
-alternative_order text/enriched text/plain text
+alternative_order application/pgp text/plain text/html text/enriched
 
 #
 # Key bindings
@@ -88,7 +88,7 @@ bind	index   "\ev"		previous-page
 
 bind	pager	"\Cn"		next-line
 bind	pager	"\Cp"		previous-line
-bind	pager	+		next-page
+bind	pager	+		tag-message
 bind	pager	<delete>	delete-message
 bind	pager	<down>		next-line
 bind	pager	<end>		bottom
@@ -108,11 +108,17 @@ macro	generic	"\ex"		":exec "
 macro 	pager	"\ex"		":exec "
 macro	generic	"\eX"		"\ex"
 macro 	pager	"\eX"		"\ex"
+macro	index	"~"		";~"
+
+# 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."
 
 # for majordomo list owner and moderator jobs
 
-macro	index	"\ea"		":set nopipe_decode wait_key\n|approve -d\n:set nowait_key\n"
-macro 	pager 	"\ea"		":set nopipe_decode wait_key\n|approve -d\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.
 
@@ -155,7 +161,7 @@ ignore nntp-posting-host path old-return-path received references
 ignore priority >received >>received
 ignore resent- return-path xref path
 ignore x400 importance sensitivity autoforward original-encoded-information
-ignore x-
+ignore x- thread-
 
 ignore list- comments posted-to approved-by
 
@@ -178,12 +184,12 @@ set   charset=iso-8859-1		# The local character set
 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\223' ' \"'" # fix some funny characters
+set   display_filter="tr '\240\204\223\226' ' \"\"-'" # fix some funny characters
 set   edit_hdrs				# I want to edit the headers.
-set   editor="/usr/bin/jed %s -f 'mail_mode();'"	
+set   editor="/usr/bin/jed %s -f 'flower_mode();'"	
  					# Invoke jed with mail_mode.  This may
 	                                # or may not work for you.
-set envelope_from			# set messages' envelope-from header.
+set   envelope_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.
@@ -201,6 +207,8 @@ 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   pgp_replyencrypt			# Encrypt when replying to encrypted messages.
 set   pgp_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   pgp_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).
@@ -233,9 +241,6 @@ set   to_chars=" +TCF "			# Don't tag list mail in the index
 
 unset use_domain			# Don't append a domain to addresses.
 
-# folder-hook . "set use_domain"		# hack, so I can enter address fragments 
-# send-hook ~A  "set use_domain"		# on the command line.
-
 set   write_inc=50			# Progress indicator when writing folders.
 set   query_command="lbdbq %s"		# Use the Little Brother's Database with the external
 					# query feature.
@@ -247,18 +252,23 @@ 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   index_format="%4C %Z %[%b %d] %-15.15L (%4c) %s"	# Somewhat different index format, which works
+set   index_format="%4C %Z %{%b %d} %-15.15L (%4c) %s"	# Somewhat different index format, which works
 					# nicely with maildir folders.
 set   rfc2047_parameters		# Sometimes, I get mails which use a bogus encoding for
 					# MIME parameters.  Setting this shouldn't harm.
+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 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]%>-"
+set pager_format="-%Z- %C/%m: %.20n %> %s"
 
-
+set smileys="^$"
 
 # PGP command configuration
-source ~/.mutt/pgp2.rc
+# source ~/.mutt/pgp2.rc
+source ~/.mutt/gpg.rc
 
 
 # source non-public stuff, (hooks, alternates, ...)