Rocco Rutte:

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index f397051..40c7772 100644 (file)
--- a/init.h
+++ b/init.h
@@ -507,6 +507,19 @@ struct option_t MuttVars[] = {
    ** deleting will automatically be purged without prompting.  If set to
    ** \fIno\fP, messages marked for deletion will be kept in the mailbox.
    */
+  {"delete_space", DT_BOOL, R_NONE, OPTDELSP, 0},
+  /*
+   ** .pp
+   ** When sending messages with \fTformat=flowed\fP by \fIsetting\fP the
+   ** $$$text_flowed variable, this variable specifies whether to also
+   ** set the \fTDelSp\fP parameter to \fTyes\fP. If this is \fIunset\fP,
+   ** no additional parameter will be send as a value of \fTno\fP already
+   ** is the default behavior.
+   **
+   ** .pp
+   ** \fBNote:\fP this variable only has an effect on \fIoutgoing\fP messages
+   ** (if $$$text_flowed is \fIset\fP) but not on incomming.
+   */
   {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, 1},
   /*
    ** .pp
@@ -542,7 +555,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** \fBNote:\fP you should not enable this unless you are using Sendmail
-   ** 8.8.x or greater.
+   ** 8.8.x or greater or in connection with the SMTP support via libESMTP.
    ** .pp
    ** This variable sets the request for when notification is returned.  The
    ** string consists of a comma separated list (no spaces!) of one or more
@@ -557,7 +570,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** \fBNote:\fP you should not enable this unless you are using Sendmail
-   ** 8.8.x or greater.
+   ** 8.8.x or greater or in connection with the SMTP support via libESMTP.
    ** .pp
    ** This variable controls how much of your message is returned in DSN
    ** messages.  It may be set to either \fIhdrs\fP to return just the
@@ -593,6 +606,13 @@ struct option_t MuttVars[] = {
    ** they contain the string ``\fTFrom \fP'' (note the trailing space)
    ** in the beginning of a line. Useful to avoid the tampering certain mail
    ** delivery and transport agents tend to do with messages.
+   **
+   ** .pp
+   ** \fBNote:\fP as mutt-ng currently violates RfC3676 defining
+   ** \fTformat=flowed\fP, it's <em/strongly/ advised to \fIset\fP
+   ** this option although discouraged by the standard. Alternatively,
+   ** you must take care of space-stuffing <tt/From / lines (with a trailing
+   ** space) yourself.
    */
   {"envelope_from", DT_BOOL, R_NONE, OPTENVFROM, 0},
   /*
@@ -1235,7 +1255,15 @@ struct option_t MuttVars[] = {
    ** from (instead to the author only). Setting this option to ``\fIask-yes\fP'' or
    ** ``\fIask-no\fP'' will ask if you really intended to reply to the author only.
    */
-  {"max_line_length", DT_NUM, R_NONE, UL &MaxLineLength, 0},
+  {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, 0},
+  /*
+   ** .pp
+   ** When set non-zero, this specifies the maximum number of recipient header
+   ** lines (\fTTo:\fP, \fTCc:\fP and \fTBcc:\fP) to display in the pager if header
+   ** weeding is turned on. In case the number of lines exeeds its value, the
+   ** last line will have 3 dots appended.
+   */
+  {"max_line_length", DT_NUM, R_PAGER, UL &MaxLineLength, 0},
   /*
    ** .pp
    ** When \fIset\fP, the maximum line length for displaying ``format = flowed'' messages is limited
@@ -2360,7 +2388,7 @@ struct option_t MuttVars[] = {
    ** Availability: SMTP
    **
    ** .pp
-   ** Defines the password to use with SMTP AUTH.  If ``$$smtp_auth_username''
+   ** Defines the password to use with SMTP AUTH.  If ``$$smtp_user''
    ** is set, but this variable is not, you will be prompted for a password
    ** when sending.
    ** .pp
@@ -2368,6 +2396,20 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.  
    */
+  {"smtp_envelope", DT_STR, R_NONE, UL &SmtpEnvFrom, 0},
+  /*
+   ** .pp
+   ** Availability: SMTP
+   **
+   ** .pp
+   ** If this variable is non-empty, it'll be used as the envelope sender. If it's empty
+   ** (the default), the value of the regular \fTFrom:\fP header will be used.
+   **
+   ** .pp
+   ** This may be necessary as some providers don't allow for arbitrary values
+   ** as the envelope sender but only a particular one which may not be the same as the
+   ** user's desired \fTFrom:\fP header.
+   */
   {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0},
   /*
    ** .pp
@@ -3500,10 +3542,12 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBWarning:\fP do not set this variable unless you are using a version
    ** of sendmail which supports the \fT-B8BITMIME\fP flag (such as sendmail
-   ** 8.8.x) or you may not be able to send mail.
+   ** 8.8.x) or in connection with the SMTP support via libESMTP.
+   ** Otherwise you may not be able to send mail.
    ** .pp
-   ** When \fIset\fP, Mutt-ng will invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
-   ** flag when sending 8-bit messages to enable ESMTP negotiation.
+   ** When \fIset\fP, Mutt-ng will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
+   ** flag when sending 8-bit messages to enable ESMTP negotiation or tell
+   ** libESMTP to do so.
    */
   {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, 1},
   /*