X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=3906a331214cdb9ebf46ff99c26708bb0a92bcb0;hp=95802020d5309e597c510418baa90c15f036bb04;hb=3d5533f226da9cd9f86236c658c26be01ebf1e87;hpb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b;ds=sidebyside

diff --git a/init.h b/init.h
index 9580202..3906a33 100644
--- a/init.h
+++ b/init.h
@@ -81,9 +81,6 @@ struct option_t {
 /* build complete documentation */
 
 #ifdef _MAKEDOC
-# ifndef USE_IMAP
-#  define USE_IMAP
-# endif
 # ifndef MIXMASTER
 #  define MIXMASTER "mixmaster"
 # endif
@@ -1012,12 +1009,8 @@ struct option_t MuttVars[] = {
    ** Remember: This option works only for mailing lists which are explicitly set in your muttngrc
    ** configuration file.
    */
-#ifdef USE_IMAP
   {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This is a colon-delimited list of authentication methods Mutt-ng may
    ** attempt to use to log in to an IMAP server, in the order Mutt-ng should
@@ -1042,12 +1035,8 @@ struct option_t MuttVars[] = {
    ** your server on connection, and add them to the set of mailboxes
    ** it polls for new mail. See also the ``$mailboxes'' command.
    */
-  
   {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."},
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This contains the list of characters which you would like to treat
    ** as folder separators for displaying IMAP paths. In particular it
@@ -1055,9 +1044,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Mutt-ng requests these header fields in addition to the default headers
    ** (``DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE
@@ -1069,9 +1055,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** You normally want to see your personal folders alongside
    ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set
@@ -1079,9 +1062,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This variable specifies the maximum amount of time in seconds that Mutt-ng
    ** will wait before polling open IMAP connections, to prevent the server
@@ -1097,9 +1077,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Your login name on the IMAP server.
    ** .pp
@@ -1107,9 +1084,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This variable configures whether IMAP folder browsing will look for
    ** only subscribed folders or all folders.  This can be toggled in the
@@ -1124,9 +1098,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Specifies the password for your IMAP account.  If \fIunset\fP, Mutt-ng will
    ** prompt you for your password when you invoke the fetch-mail function.
@@ -1137,9 +1108,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** When \fIset\fP, Mutt-ng will not open new IMAP connections to check for new
    ** mail.  Mutt-ng will only check for new mail over existing IMAP
@@ -1149,9 +1117,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** If \fIset\fP, Mutt-ng will avoid implicitly marking your mail as read whenever
    ** you fetch a message from the server. This is generally a good thing,
@@ -1160,18 +1125,12 @@ struct option_t MuttVars[] = {
    */
   {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Controls whether or not Mutt-ng will try to reconnect to IMAP server when
    ** the connection is lost.
    */
   {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** When \fIset\fP, Mutt-ng will display warning messages from the IMAP
    ** server as error messages. Since these messages are often
@@ -1181,16 +1140,12 @@ struct option_t MuttVars[] = {
    */
   {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** The name of the user whose mail you intend to access on the IMAP
    ** server.
    ** .pp
    ** This variable defaults to your user name on the local machine.
    */
-#endif
   {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" },
   /*
    ** .pp
@@ -3832,9 +3787,6 @@ static const char* Features[] = {
 #ifdef USE_NNTP
   "nntp",
 #endif
-#ifdef USE_IMAP
-  "imap",
-#endif
 #ifdef USE_SSL
   "ssl",
 #endif