Merge branch 'stable'

2 files changed, 19 insertions, 3 deletions

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 5d325f40..dea8eeaa 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -7767,6 +7767,25 @@ echo (equal "one two" "`echo one two`")
   ==> "t"
   note: backticks inside double quotes generates a single argument: "one two"
 </screen>
+      <para>
+        Note that boolean configuration variables evaluate to the strings
+        &quot;yes&quot; or &quot;no&quot;.  You can see the value of other
+        kinds of configuration variables using the
+        <link linkend="echo">echo</link> command.
+      </para>
+<screen>
+unset allow_ansi
+echo $allow_ansi
+  ===> "no"
+
+# the correct way to test a boolean:
+echo (if (equal $allow_ansi "yes") "set" "unset")
+  ===> "unset"
+
+# the incorrect way to test a boolean:
+echo (if $allow_ansi "set" "unset")
+  ===> "set"
+</screen>
     </sect3>
 
     <sect3 id="muttlisp-not">
diff --git a/init.h b/init.h
index ea0bb975..9ca57281 100644
--- a/init.h
+++ b/init.h
@@ -2018,9 +2018,6 @@ struct option_t MuttVars[] = {
   ** since the last time you opened the mailbox.  When \fIunset\fP, Mutt will notify you
   ** if any new mail exists in the mailbox, regardless of whether you have visited it
   ** recently.
-  ** .pp
-  ** When \fI$$mark_old\fP is set, Mutt does not consider the mailbox to contain new
-  ** mail if only old messages exist.
   */
   { "mail_check_stats", DT_BOOL, R_NONE, {.l=OPTMAILCHECKSTATS}, {.l=0} },
   /*