X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=b839d0b0a34f752aafee113363cf784ec31cf9da;hp=175133f49cc066ef709cb8dc8a9d9cdcb7456fe1;hb=e39e529e5df06cd4148de4614073b66a23be0b26;hpb=480b58036b7e8d75980ce2b7ef2d2e59acd13178

diff --git a/init.h b/init.h
index 175133f..b839d0b 100644
--- a/init.h
+++ b/init.h
@@ -211,7 +211,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"ask_followup_to", DT_SYN, R_NONE, UL "nntp_ask_followup_to", 0},
-  {"nntp_ask_follow_up", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0},
+  {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0},
   /*
    ** .pp
    ** Availability: NNTP
@@ -987,6 +987,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 +1077,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.
    */
@@ -1657,7 +1668,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
@@ -3289,6 +3300,20 @@ struct option_t MuttVars[] = {
    ** Setting this variable causes the ``status bar'' to be displayed on
    ** the first line of the screen rather than near the bottom.
    */
+  {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, 1},
+  /*
+   **
+   ** .pp
+   ** With mailto: style links, a body as well as arbitrary header information
+   ** may be embedded. This may lead to (user) headers being overwriten without note
+   ** if ``$$edit_headers'' is unset.
+   **
+   ** .pp
+   ** If this variable is \fIset\fP, mutt-ng is strict and allows anything to be
+   ** changed. If it's \fIunset\fP, all headers given will be prefixed with
+   ** ``X-Mailto-'' and the message including headers will be shown in the editor
+   ** regardless of what ``$$edit_headers'' is set to.
+   **/
   {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, 1},
   /*
    ** .pp
@@ -3553,6 +3578,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