X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=c5a4b56274e98bbd07bb8e3d2fe73862780395bc;hp=2ccc46470fe79f260395ba43330fd0908ce651ac;hb=f9f8b2003d4a5e7dfaf5604fedf835686acdc38e;hpb=6c248aa3490f9c948da1bcfe49bdf8d7ba25e372 diff --git a/init.h b/init.h index 2ccc464..c5a4b56 100644 --- a/init.h +++ b/init.h @@ -210,7 +210,7 @@ struct option_t MuttVars[] = { ** checking each file to see if it has already been looked at. If it's ** \fIunset\fP, no check for new mail is performed while the mailbox is open. */ - {"collapse_unread", DT_BOOL, OPTCOLLAPSEUNREAD, "yes" }, + {"collapse_unread", DT_BOOL, OPTCOLLAPSEUNREAD, "no" }, /* ** .pp ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any @@ -364,11 +364,7 @@ struct option_t MuttVars[] = { ** Which empty header fields to show is controlled by the ** $$editor_headers option. */ -#ifdef USE_NNTP - {"editor_headers", DT_STR, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To: Newsgroups: Followup-To: X-Comment-To:" }, -#else {"editor_headers", DT_STR, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" }, -#endif /* ** .pp ** If $$edit_headers is \fIset\fP, this space-separated list specifies @@ -933,12 +929,6 @@ struct option_t MuttVars[] = { ** At which characters this compression is done is controled via the ** $$sidebar_boundary variable. */ - {"mbox_type", DT_MAGIC, UL &DefaultMagic, "mbox" }, - /* - ** .pp - ** The default mailbox type used when creating new folders. May be any of - ** \fTmbox\fP, \fTMH\fP and \fTMaildir\fP. - */ {"metoo", DT_BOOL, OPTMETOO, "no" }, /* ** .pp @@ -1943,175 +1933,6 @@ struct option_t MuttVars[] = { ** $$xterm_set_titles has been \fIset\fP. This string is identical in formatting ** to the one used by ``$$status_format''. */ -#ifdef USE_NNTP - {"nntp_post_moderated", DT_QUAD, OPT_TOMODERATED, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have - ** not permissions to post (e.g. moderated). - ** .pp - ** \fBNote:\fP if the newsserver - ** does not support posting to that newsgroup or a group is totally read-only, that - ** posting will not have any effect. - */ - {"nntp_host", DT_STR, UL &NewsServer, "" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable specifies the name (or address) of the NNTP server to be used. - ** .pp - ** It - ** defaults to the value specified via the environment variable - ** \fT$$$NNTPSERVER\fP or contained in the file \fT/etc/nntpserver\fP. - ** .pp - ** You can also - ** specify a username and an alternative port for each newsserver, e.g. - ** .pp - ** \fT[nntp[s]://][username[:password]@]newsserver[:port]\fP - ** .pp - ** \fBNote:\fP Using a password as shown and stored in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"nntp_context", DT_NUM, UL &NntpContext, "1000" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls how many news articles to cache per newsgroup - ** (if caching is enabled, see $$nntp_cache_dir) and how many news articles - ** to show in the ``index'' menu. - ** .pp - ** If there're more articles than defined with $$nntp_context, all older ones - ** will be removed/not shown in the index. - */ - {"nntp_load_description", DT_BOOL, OPTLOADDESC, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls whether or not descriptions for newsgroups - ** are to be loaded when subscribing to a newsgroup. - */ - {"nntp_user", DT_STR, UL &NntpUser, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your login name on the NNTP server. If \fIunset\fP and the server requires - ** authentification, Madmutt will prompt you for your account name. - */ - {"nntp_pass", DT_STR, UL &NntpPass, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your password for NNTP account. - ** .pp - ** \fBNote:\fP Storing passwords in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"nntp_mail_check", DT_NUM, UL &NewsPollTimeout, "60" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** The time in seconds until any operations on a newsgroup except posting a new - ** article will cause a recheck for new news. If set to 0, Madmutt will - ** recheck on each operation in index (stepping, read article, etc.). - */ - {"nntp_reconnect", DT_QUAD, OPT_NNTPRECONNECT, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Controls whether or not Madmutt will try to reconnect to a newsserver when the - ** was connection lost. - */ - {"nntp_group_index_format", DT_STR, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable allows you to customize the newsgroup browser display to - ** your personal taste. This string is similar to ``$index_format'', but - ** has its own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .ts - ** %C current newsgroup number - ** %d description of newsgroup (retrieved from server) - ** %f newsgroup name - ** %M ``-'' if newsgroup not allowed for direct post (moderated for example) - ** %N ``N'' if newsgroup is new, ``u'' if unsubscribed, blank otherwise - ** %n number of new articles in newsgroup - ** %s number of unread articles in newsgroup - ** %>X right justify the rest of the string and pad with character "X" - ** %|X pad to the end of the line with character "X" - ** .te - */ - {"nntp_followup_to_poster", DT_QUAD, OPT_FOLLOWUPTOPOSTER, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If this variable is \fIset\fP and the keyword "\fTposter\fP" is present in - ** the \fTFollowup-To:\fP header field, a follow-up to the newsgroup is not - ** permitted. The message will be mailed to the submitter of the - ** message via mail. - */ - {"nntp_catchup", DT_QUAD, OPT_CATCHUP, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup - ** as read when you leaving it. - */ - {"nntp_ask_followup_to", DT_BOOL, OPTASKFOLLOWUP, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header - ** field before editing the body of an outgoing news article. - */ - {"nntp_show_new_news", DT_BOOL, OPTSHOWNEWNEWS, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, the newsserver will be asked for new newsgroups on entering - ** the browser. Otherwise, it will be done only once for a newsserver. - ** Also controls whether or not the number of new articles of subscribed - ** newsgroups will be checked. - */ - {"nntp_show_only_unread", DT_BOOL, OPTSHOWONLYUNREAD, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, only subscribed newsgroups that contain unread articles - ** will be displayed in the newsgroup browser. - */ -#endif /*--*/ { NULL, -1, -1, NULL } }; @@ -2196,26 +2017,9 @@ struct command_t Commands[] = { {"bind", mutt_parse_bind, 0}, {"color", mutt_parse_color, 0}, {"exec", mutt_parse_exec, 0}, - {"append-hook", mutt_parse_hook, M_APPENDHOOK}, - {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, - {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, - {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, - {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, - {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, - {"mbox-hook", mutt_parse_hook, M_MBOXHOOK}, - {"message-hook", mutt_parse_hook, M_MESSAGEHOOK}, - {"open-hook", mutt_parse_hook, M_OPENHOOK}, - {"pgp-hook", mutt_parse_hook, M_CRYPTHOOK}, - {"reply-hook", mutt_parse_hook, M_REPLYHOOK}, - {"save-hook", mutt_parse_hook, M_SAVEHOOK}, - {"send2-hook", mutt_parse_hook, M_SEND2HOOK}, - {"send-hook", mutt_parse_hook, M_SENDHOOK}, {"macro", mutt_parse_macro, 0}, - {"mono", mutt_parse_mono, 0}, {"push", mutt_parse_push, 0}, {"uncolor", mutt_parse_uncolor, 0}, - {"unhook", mutt_parse_unhook, 0}, - {"unmono", mutt_parse_unmono, 0}, {"alias", parse_alias, 0}, {"attachments", parse_attachments, 0 }, {"my_hdr", parse_my_hdr, 0},