The global Muttrc contains a list of default settings

which can be used as a starting-point for the user's own
configuration.

5 files changed, 210 insertions, 28 deletions

diff --git a/Makefile.in b/Makefile.in
index 0cb4d8cc..8bda5d88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,7 @@ OBJS=	addrbook.o alias.o attach.o browser.o buffy.o color.o \
 
 CLEANFILES=mutt *.o core
 VERYCLEANFILES=$(CLEANFILES) Makefile config.cache config.log \
-	config.status config.h
+	config.status config.h Muttrc
 DISTCLEANFILES=$(VERYCLEANFILES) tags keymap_defs.h *.rej *.orig *~ Makefile.bak
 
 # kill these files when making new export distributions
diff --git a/Muttrc b/Muttrc
deleted file mode 100644
index 9eed4f12..00000000
--- a/Muttrc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# System configuration file for Mutt
-#
-
-# default list of header fields to weed when displaying
-#
-ignore "from " received content- mime-version status x-status message-id
-ignore sender references return-path lines
-
-# imitate the old search-body function
-macro index \eb '/~b '
-
-# simluate the old url menu
-macro index \cb |urlview\n
-macro pager \cb |urlview\n
-
-# If Mutt is unable to determine your sites domain name correctly, you can
-# set the default here.
-#
-# set hostname=cs.hmc.edu
-
-# If your sendmail supports the -B8BITMIME flag, enable the following
-#
-# set use_8bitmime
diff --git a/Muttrc.in b/Muttrc.in
new file mode 100644
index 00000000..c524dc32
--- /dev/null
+++ b/Muttrc.in
@@ -0,0 +1,206 @@
+#
+# System configuration file for Mutt
+#
+
+# default list of header fields to weed when displaying
+#
+ignore "from " received content- mime-version status x-status message-id
+ignore sender references return-path lines
+
+# imitate the old search-body function
+macro index \eb '/~b '
+
+# simluate the old url menu
+macro index \cb |urlview\n
+macro pager \cb |urlview\n
+
+# If Mutt is unable to determine your sites domain name correctly, you can
+# set the default here.
+#
+# set hostname=cs.hmc.edu
+
+# If your sendmail supports the -B8BITMIME flag, enable the following
+#
+# set use_8bitmime
+
+##
+## More settings
+##
+
+# set abort_nosubject=ask-yes
+# set abort_unmodifyed=yes
+# set alias_file="~/.muttrc"
+# set alias_format=""%2n %t %-10a   %r"
+# set allow_8bit
+# set alternates=""
+# unset arrow_cursor
+# unset ascii_chars
+# unset askbcc
+# unset askcc
+# set attribution="On %d, %n wrote:"
+# unset autoedit
+# unset auto_tag
+# set beep
+# set beep_new
+# set charset="iso-8859-1"
+# set check_new
+# set confirmappend
+# set confirmcreate
+# set copy=yes
+# set date_format="!%a, %b %d, %Y at %I:%M:%S%p %Z"
+# set delete_format="[-- Attachment from %u deleted %<%b %d %T %Y> --]"
+# set default_hook="~f %s !~P | (~P ~C %s)"
+# set delete=ask-yes
+# set dsn_notify=""
+# set dsn_return=""
+# unset edit_headers
+# set editor=""
+# set empty_to="undisclosed-recipients"
+# set escape="~"
+# unset fast_reply
+# unset fcc_attach
+# set folder="~/Mail"
+# set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
+# set followup_to
+# unset force_name
+# set forward_decode
+# set forward_format="[%a: %s]"
+# unset forward_quote
+# set hdrs
+# unset header
+# set help
+# set history=10
+# set hostname=""
+# set in_reply_to="%i; from %n on %{!%a, %b %d, %Y at %I:%M:%S%p %Z}"
+# set include=ask-yes
+# set indent_string="> "
+# set index_format="%4C %Z %{%b %d} %-15.15L (%4l) %s"
+# unset ignore_list_rely_to
+# set ispell="@ISPELL@"
+# set locale="C"
+# set mail_check=5
+# set mailcap_path=""
+# set mark_old
+# set markers
+# set mask="^(\\.\\.$|[^.])"
+# set mbox="~/mbox"
+# set mbox_type="mbox"
+# unset metoo
+# unset menu_scroll
+# unset meta_key
+# unset mime_forward
+# unset mime_forward_decode
+# set move=ask-no
+# set message_format="%s"
+# set pager="builtin"
+# unset pager_context
+# set pager_format="-%S- %C/%m: %-20.20n   %s"
+# set pager_index_lines=0
+# unset pager_stop
+# unset pip_split
+# unset pipe_decode
+# set pipe_sep="\n"
+# set post_indent_string=""
+# set postpone=ask-yes
+# set postponed="~/postponed"
+# set print=ask-no
+# set print_command="lpr"
+# set prompt_after=1
+# set query_command=""
+# set quit=yes
+# set quote_regexp="^([ \t]*[|>:}#])+"
+# set reply_regexp="^(re([\\[0-9\\]+])*|aw):[ \t]*"
+# set read_inc=10
+# unset read_only
+# set realname=""
+# set recall=ask-yes
+# set record=""
+# set reply_to=ask-yes
+# set resolve
+# unset reverse_alias
+# unset reverse_name
+# unset save_address
+# set save_empty
+# unset save_name
+# set sendmail="@SENDMAIL@ -oem -oi"
+# set sendmail_wait=0
+# set shell=""
+# set sig_dashes
+# set signature="~/.signature"
+# set simpple_search="~f %s | ~s %s"
+# set smart_wrap
+# set sort=date-sent
+# set sort_alias=alias
+# set sort_aux=date-sent
+# set sort_browser=subject
+# set sort_re
+# set spoolfile=""
+# set status_chars="-*%"
+# set status_format="-%r-Mutt: %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?]---(%s/%S)-%>-(%P)---"
+# unset status_on_top
+# unset strict_threads
+# set suspend
+# unset thorough_search
+# unset tilde
+# set timeout=600
+# set tmpdir=""
+# set to_chars="+TCF"
+# unset use_8bitmime
+# set use_domain
+# set use_from
+# set use_mailcap
+# set visual=""
+# set wait_key
+# set wrap_search
+# set write_inc=10
+
+## The following options are only vaild if you have
+## compiled in IMAP support
+
+# set imap_user=""
+# set imap_pass=""
+# set imap_checkinterval=""
+
+## The following options are only valid if you have 
+## compiled in PGP support
+
+# unset pgp_autosign
+# unset pgp_autoencrypt
+# set pgp_encryptself
+# unset pgp_long_ids
+# unset pgp_replyencrypt
+# unset pgp_replysign
+# set pgp_sign_as=""
+# set pgp_sign_micalg="pgp-md5"
+# set pgp_strict_enc
+# set pgp_timeout=300
+# set pgp_verify_sig=yes
+
+# set pgp_v2="@PGP@"
+# set pgp_v2_language="en"
+# set pgp_v2_pubring=""
+# set pgp_v2_secring=""
+
+# set pgp_v5="@PGPK@"
+# set pgp_v5_language=""
+# set pgp_v5_pubring=""
+# set pgp_v5_secring=""
+
+# set pgp_gpg="@GPG@"
+# set pgp_default_version="pgp2" # (Not really the default, but...)
+
+# Here, "default" means the value of $pgp_default_version:
+
+# set pgp_receive_version="default"
+# set pgp_key_version="default"
+# set pgp_send_version="default"
+
+## The following options are only available if you have
+## compiled in POP support
+
+# unset pop_delete
+# set pop_host=""
+# set pop_port=110
+# set pop_pass=""
+# set pop_user=""
+
diff --git a/configure b/configure
index 43e5018a..0cc89268 100755
--- a/configure
+++ b/configure
@@ -2980,7 +2980,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile rx/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile rx/Makefile Muttrc config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3067,7 +3067,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile rx/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile rx/Makefile Muttrc"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/configure.in b/configure.in
index 83c7560b..b76d02f3 100644
--- a/configure.in
+++ b/configure.in
@@ -386,4 +386,4 @@ AC_ARG_ENABLE(exact-address, [  --enable-exact-address     enable regeneration o
 		AC_DEFINE(EXACT_ADDRESS)
 	fi])
 
-AC_OUTPUT(Makefile rx/Makefile)
+AC_OUTPUT(Makefile rx/Makefile Muttrc)