X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/ddf8a9dd6bbabd3ba3716abb794ac965877405d4..fb164ff46f3e5e352f800367f9d7f555b19d666f:/debian/patches/debian-specific/document_debian_defaults diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults index 1f06d81..8d97e29 100644 --- a/debian/patches/debian-specific/document_debian_defaults +++ b/debian/patches/debian-specific/document_debian_defaults @@ -1,28 +1,29 @@ -Index: debian-mutt/init.h -=================================================================== ---- debian-mutt.orig/init.h 2007-03-24 17:54:00.000000000 +0100 -+++ debian-mutt/init.h 2007-03-24 18:00:57.000000000 +0100 -@@ -289,6 +289,9 @@ struct option_t MuttVars[] = { +Some customization of the option which are straying from the default +only on Debian systems + +--- a/init.h ++++ b/init.h +@@ -312,6 +312,9 @@ ** .pp - ** When this variable is set, mutt will include Delivered-To headers when - ** bouncing messages. Postfix users may wish to unset this variable. + ** When this variable is \fIset\fP, mutt will include Delivered-To headers when + ** bouncing messages. Postfix users may wish to \fIunset\fP this variable. + ** .pp + ** \fBNote:\fP On Debian systems, this option is unset by default in + ** /etc/Muttrc. */ { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 }, /* -@@ -798,6 +801,9 @@ struct option_t MuttVars[] = { - ** Specifies the hostname to use after the ``@'' in local e-mail - ** addresses. This overrides the compile time definition obtained from - ** /etc/resolv.conf. +@@ -1032,6 +1035,9 @@ + ** one is not used. + ** .pp + ** Also see $$use_domain and $$hidden_host. + ** .pp + ** \fBNote:\fP On Debian systems, the default for this variable is obtained + ** from /etc/mailname when Mutt starts. */ { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 }, /* -@@ -1301,6 +1307,9 @@ struct option_t MuttVars[] = { +@@ -1564,6 +1570,9 @@ ** system. It is used with various sets of parameters to gather the ** list of known remailers, and to finally send a message through the ** mixmaster chain. @@ -31,8 +32,8 @@ Index: debian-mutt/init.h + ** ``mixmaster-filter'' in /etc/Muttrc. */ #endif - -@@ -1843,6 +1852,10 @@ struct option_t MuttVars[] = { + { "move", DT_QUAD, R_NONE, OPT_MOVE, M_NO }, +@@ -2580,6 +2589,10 @@ ** This variable contains the name of either a directory, or a file which ** contains trusted certificates for use with OpenSSL. ** (S/MIME only) @@ -43,33 +44,33 @@ Index: debian-mutt/init.h */ { "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 }, /* -@@ -2049,6 +2062,9 @@ struct option_t MuttVars[] = { - ** certificates are also automatically accepted. - ** .pp - ** Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt +@@ -2786,6 +2799,9 @@ + ** .ts + ** set smtp_authenticators="digest-md5:cram-md5" + ** .te + ** .pp + ** \fBNote:\fP On Debian systems, this variable defaults to the example + ** mentioned. This file is managed by the ``ca-certificates'' package. */ - # endif /* USE_SSL_GNUTLS */ - #endif /* defined(USE_SSL) */ -@@ -2626,6 +2642,9 @@ struct option_t MuttVars[] = { + # endif /* USE_SASL */ + { "smtp_pass", DT_STR, R_NONE, UL &SmtpPass, UL 0 }, +@@ -2833,6 +2849,9 @@ ** .pp - ** You may optionally use the reverse- prefix to specify reverse sorting - ** order (example: set sort=reverse-date-sent). + ** You may optionally use the ``reverse-'' prefix to specify reverse sorting + ** order (example: ``\fCset sort=reverse-date-sent\fP''). + ** .pp + ** \fBNote:\fP On Debian systems, this option is set by default to + ** ``threads'' in /etc/Muttrc. */ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS }, /* -@@ -3022,6 +3041,9 @@ struct option_t MuttVars[] = { - ** is set to deliver directly via SMTP (see ``$$smtp_url''), this - ** option does nothing: mutt will never write out the BCC header +@@ -3358,6 +3377,9 @@ + ** is set to deliver directly via SMTP (see $$smtp_url), this + ** option does nothing: mutt will never write out the ``Bcc:'' header ** in this case. + ** .pp + ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by + ** default. The above warning applies to exim3 users, see /etc/Muttrc. */ - {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"}, + { "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 }, /*