byebye OPTARROWCURSOR

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index 895bc0a..648e0c5 100644 (file)
--- a/init.h
+++ b/init.h
@@ -11,12 +11,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef _MAKEDOC
-# include "config.h"
-#else
-# include "sort.h"
-#endif
-
+#include "sort.h"
 #include "mutt.h"
 
 #ifndef _MAKEDOC
@@ -139,15 +134,6 @@ struct option_t MuttVars[] = {
    ** message could include a line like ``\fT[-- PGP output follows ...\fP" and
    ** give it the same color as your attachment color.
    */
-  {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, "no" },
-  /*
-   ** .pp
-   ** When \fIset\fP, an arrow (``\fT->\fP'') will be used to indicate the current entry
-   ** in menus instead of highlighting the whole line.  On slow network or modem
-   ** links this will make response faster because there is less that has to
-   ** be redrawn on the screen when moving to the next or previous entries
-   ** in the menu.
-   */
   {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, "no" },
   /*
    ** .pp
@@ -176,15 +162,6 @@ struct option_t MuttVars[] = {
    ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header
    ** field before editing the body of an outgoing news article.
    */
-  {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, "no" },
-  /*
-   ** .pp
-   ** Availability: NNTP
-   **
-   ** .pp
-   ** If \fIset\fP, Madmutt will prompt you for the \fTX-Comment-To:\fP header
-   ** field before editing the body of an outgoing news article.
-   */
 #endif
   {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "},
   /*
@@ -1681,14 +1658,6 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP
    */
-  {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will try all available methods. When \fIunset\fP, Madmutt will
-   ** only fall back to other authentication methods if the previous
-   ** methods are unavailable. If a method is available but authentication
-   ** fails, Madmutt will not connect to the POP server.
-   */
   {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
   /*
    ** .pp
@@ -1977,36 +1946,6 @@ struct option_t MuttVars[] = {
    ** possibly including eventual real names.  When it is \fIunset\fP, Madmutt will
    ** override any such real names with the setting of the $realname variable.
    */
-  {"score", DT_BOOL, R_NONE, OPTSCORE, "yes" },
-  /*
-   ** .pp
-   ** When this variable is \fIunset\fP, scoring is turned off.  This can
-   ** be useful to selectively disable scoring for certain folders when the
-   ** ``$$score_threshold_delete'' variable and friends are used.
-   **
-   */
-  {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, "-1" },
-  /*
-   ** .pp
-   ** Messages which have been assigned a score equal to or lower than the value
-   ** of this variable are automatically marked for deletion by Madmutt.  Since
-   ** Madmutt scores are always greater than or equal to zero, the default setting
-   ** of this variable will never mark a message for deletion.
-   */
-  {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, "9999" },
-  /*
-   ** .pp
-   ** Messages which have been assigned a score greater than or equal to this
-   ** variable's value are automatically marked ``flagged''.
-   */
-  {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, "-1" },
-  /*
-   ** .pp
-   ** Messages which have been assigned a score equal to or lower than the value
-   ** of this variable are automatically marked as read by Madmutt.  Since
-   ** Madmutt scores are always greater than or equal to zero, the default setting
-   ** of this variable will never mark a message read.
-   */
 #ifdef USE_NNTP
   {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" },
   /*
@@ -2534,18 +2473,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_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, "no" },
-  /*
-   ** .pp
-   ** Availability: NNTP
-   **
-   ** .pp
-   ** If \fIset\fP, Madmutt will add a ``\fTX-Comment-To:\fP'' header field
-   ** (that contains full name of the original article author) to articles that
-   ** you followup to.
-   */
-#endif
   /*--*/
   { NULL, -1, R_NONE, -1, NULL }
 };
@@ -2630,7 +2557,6 @@ struct command_t Commands[] = {
     {"bind",                mutt_parse_bind,       0},
     {"color",               mutt_parse_color,      0},
     {"exec",                mutt_parse_exec,       0},
-    {"account-hook",        mutt_parse_hook,       M_ACCOUNTHOOK},
     {"append-hook",         mutt_parse_hook,       M_APPENDHOOK},
     {"close-hook",          mutt_parse_hook,       M_CLOSEHOOK},
     {"crypt-hook",          mutt_parse_hook,       M_CRYPTHOOK},
@@ -2648,11 +2574,9 @@ struct command_t Commands[] = {
     {"macro",               mutt_parse_macro,      0},
     {"mono",                mutt_parse_mono,       0},
     {"push",                mutt_parse_push,       0},
-    {"score",               mutt_parse_score,      0},
     {"uncolor",             mutt_parse_uncolor,    0},
     {"unhook",              mutt_parse_unhook,     0},
     {"unmono",              mutt_parse_unmono,     0},
-    {"unscore",             mutt_parse_unscore,    0},
     {"alias",               parse_alias,           0},
     {"attachments",         parse_attachments,     0 },
     {"my_hdr",              parse_my_hdr,          0},