diff options
author | TAKIZAWA Takashi <taki@luna.email.ne.jp> | 2007-02-27 17:44:08 +0000 |
---|---|---|
committer | TAKIZAWA Takashi <taki@luna.email.ne.jp> | 2007-02-27 17:44:08 +0000 |
commit | b0f4ac704664b45d050fa8ec20faebc9663a2f9c (patch) | |
tree | 1fdec6e24d2090404478d14f79887d0befeb842d /init.h | |
parent | 5d1dd19010756d100a2449fc3ca14354cd2859a3 (diff) |
Updated $assumed_charset patch (closes: #2218).
Thanks to TAKAHASHI Tamotsu for the fixes and for handling patch conflicts.
Diffstat (limited to 'init.h')
-rw-r--r-- | init.h | 50 |
1 files changed, 23 insertions, 27 deletions
@@ -218,7 +218,7 @@ struct option_t MuttVars[] = { ** If set, Mutt will prompt you for carbon-copy (Cc) recipients before ** editing the body of an outgoing message. */ - { "assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, UL "us-ascii"}, + { "assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, UL 0}, /* ** .pp ** This variable is a colon-separated list of character encoding @@ -233,7 +233,20 @@ struct option_t MuttVars[] = { ** set assumed_charset="iso-2022-jp:euc-jp:shift_jis:utf-8" ** .pp ** However, only the first content is valid for the message body. - ** This variable is valid only if $$strict_mime is unset. + */ + { "attach_charset", DT_STR, R_NONE, UL &AttachCharset, UL 0 }, + /* + ** .pp + ** This variable is a colon-separated list of character encoding + ** schemes for text file attachments. + ** If unset, $$charset value will be used instead. + ** For example, the following configuration would work for Japanese + ** text handling: + ** .pp + ** set attach_charset="iso-2022-jp:euc-jp:shift_jis:utf-8" + ** .pp + ** Note: "iso-2022-*" must be put at the head of the value as shown above + ** if included. */ { "attach_format", DT_STR, R_NONE, UL &AttachFormat, UL "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] " }, /* @@ -614,19 +627,8 @@ struct option_t MuttVars[] = { ** signed. ** (PGP only) */ - { "file_charset", DT_STR, R_NONE, UL &FileCharset, UL 0 }, + { "file_charset", DT_SYN, R_NONE, UL "attach_charset", 0 }, /* - ** .pp - ** This variable is a colon-separated list of character encoding - ** schemes for text file attatchments. - ** If unset, $$charset value will be used instead. - ** For example, the following configuration would work for Japanese - ** text handling: - ** .pp - ** set file_charset="iso-2022-jp:euc-jp:shift_jis:utf-8" - ** .pp - ** Note: "iso-2022-*" must be put at the head of the value as shown above - ** if included. */ { "folder", DT_PATH, R_NONE, UL &Maildir, UL "~/Mail" }, /* @@ -846,6 +848,13 @@ struct option_t MuttVars[] = { ** addresses. This overrides the compile time definition obtained from ** /etc/resolv.conf. */ + { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 }, + /* + ** .pp + ** This option replaces linear-white-space between encoded-word + ** and *text to a single space to prevent the display of MIME-encoded + ** ``Subject'' field from being divided into multiple lines. + */ { "ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, 0 }, /* ** .pp @@ -2808,19 +2817,6 @@ struct option_t MuttVars[] = { ** Setting this variable causes the ``status bar'' to be displayed on ** the first line of the screen rather than near the bottom. */ - { "strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, 1 }, - /* - ** .pp - ** When unset, non MIME-compliant messages that doesn't have any - ** charset indication in ``Content-Type'' field can be displayed - ** (non MIME-compliant messages are often generated by old mailers - ** or buggy mailers like MS Outlook Express). - ** See also $$assumed_charset. - ** .pp - ** This option also replaces linear-white-space between encoded-word - ** and *text to a single space to prevent the display of MIME-encoded - ** ``Subject'' field from being devided into multiple lines. - */ { "strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0 }, /* ** .pp |