fix line number and file.

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index a20f7e1..49b87d2 100644 (file)
--- a/init.h
+++ b/init.h
@@ -11,13 +11,9 @@
  * 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"
+#include "score.h"
 
 #ifndef _MAKEDOC
 #define DT_MASK         0x0f
@@ -1503,40 +1499,6 @@ struct option_t MuttVars[] = {
    ** when you are at the end of a message and invoke the \fInext-page\fP
    ** function.
    */
-  {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" },
-  /*
-   ** .pp
-   ** The default behaviour of Madmutt is to use PGP on all auto-sign/encryption
-   ** operations. To override and to use OpenSSL instead this must be \fIset\fP.
-   ** .pp
-   ** However, this has no effect while replying, since Madmutt will automatically
-   ** select the same application that was used to sign/encrypt the original
-   ** message.
-   ** .pp
-   ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.)
-   ** (S/MIME only)
-   */
-  {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"},
-  /*
-   ** .pp
-   ** This variable allows you to customize the PGP key selection menu to
-   ** your personal taste. This string is similar to ``$$index_format'', but
-   ** has its own set of \fTprintf(3)\fP-like sequences:
-   ** .pp
-   ** .dl
-   ** .dt %n     .dd number
-   ** .dt %k     .dd key id
-   ** .dt %u     .dd user id
-   ** .dt %a     .dd algorithm
-   ** .dt %l     .dd key length
-   ** .dt %f     .dd flags
-   ** .dt %c     .dd capabilities
-   ** .dt %t     .dd trust/validity of the key-uid association
-   ** .dt %[<s>] .dd date of the key where <s> is an \fTstrftime(3)\fP expression
-   ** .de
-   ** .pp
-   ** (PGP only)
-   */
   {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" },
   /*
    ** .pp
@@ -1715,14 +1677,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
@@ -2011,36 +1965,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" },
   /*