X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=874e423104b99050ba8f50cb57498c2ffa4d6e03;hp=009cb143c5f5f60a12540e1290ba9a531b4a80bf;hb=82d5d8ffc8cd4cf837736187eba9ddfd8b2e2f7f;hpb=98a31b4c67cc31ef5c46ae3587a20838ae1bd024

diff --git a/init.h b/init.h
index 009cb14..874e423 100644
--- a/init.h
+++ b/init.h
@@ -105,6 +105,21 @@ struct feature_t {
 # ifndef USE_GNUTLS
 #  define USE_GNUTLS
 # endif
+# ifndef USE_DOTLOCK
+#  define USE_DOTLOCK
+# endif
+# ifndef DL_STANDALONE
+#  define DL_STANDALONE
+# endif
+# ifndef USE_HCACHE
+#  define USE_HCACHE
+# endif
+# ifndef HAVE_LIBIDN
+#  define HAVE_LIBIDN
+# endif
+# ifndef HAVE_GETADDRINFO
+#  define HAVE_GETADDRINFO
+# endif
 #endif
 
 struct option_t MuttVars[] = {
@@ -987,6 +1002,16 @@ struct option_t MuttVars[] = {
    ** Reduce this number if you find yourself
    ** getting disconnected from your IMAP server due to inactivity.
    */
+  {"imap_login", DT_STR, R_NONE, UL &ImapLogin, 0 },
+  /*
+   ** .pp
+   ** Availability: IMAP
+   **
+   ** .pp
+   ** Your login name on the IMAP server.
+   ** .pp
+   ** This variable defaults to the value of ``$$imap_user.''
+   */
   {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, 0},
   /*
    ** .pp
@@ -1067,7 +1092,8 @@ struct option_t MuttVars[] = {
    ** Availability: IMAP
    **
    ** .pp
-   ** Your login name on the IMAP server.
+   ** 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.
    */
@@ -1423,7 +1449,7 @@ struct option_t MuttVars[] = {
    ** This variable controls the number of lines of context that are given
    ** when scrolling through menus. (Similar to ``$$pager_context''.)
    */
-  {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, 0},
+  {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, 1},
   /*
    ** .pp
    ** When \fIunset\fP, the bottom entry of menus will never scroll up past
@@ -1657,7 +1683,7 @@ struct option_t MuttVars[] = {
    **
    ** .pp
    ** This variable controls how many news articles to cache per newsgroup
-   ** (if caching is enabled, see $$news_cache_dir) and how many news articles
+   ** (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
@@ -2403,7 +2429,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Example: \fTset certificate_file=~/.muttng/certificates\fP
    */
-# ifndef USE_GNUTLS
+# if defined(_MAKEDOC) || !defined (USE_GNUTLS)
   {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1},
   /*
    ** .pp
@@ -3567,6 +3593,20 @@ struct option_t MuttVars[] = {
    ** (as long as you're in an appropriate terminal). The default must
    ** be \fIunset\fP to force in the validity checking.
    */
+  {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, UL "" },
+  /*
+   ** .pp
+   ** If $$xterm_set_titles is \fIset\fP, this string will be used to
+   ** set the title when leaving mutt-ng. For terminal-based programs,
+   ** there's no easy and portable way to read the current title so mutt-ng
+   ** cannot read it upon startup and restore it when exiting.
+   **
+   ** .pp
+   ** Based on the xterm FAQ, the following might work:
+   **
+   ** .pp
+   ** \fTset xterm_leave = "`test x$$$DISPLAY != x && xprop -id $$$WINDOWID | grep WM_NAME | cut -d '"' -f 2`"\fP
+   */
   {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, UL "Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?"},
   /*
    ** .pp