~kevin8t8/mutt

9917c0eae89edaaca076a313dc2902a9b1ead03f — Kevin McCarthy 3 months ago db429b2 + 16d8ad6
Merge branch 'stable'
2 files changed, 31 insertions(+), 20 deletions(-)

M doc/manual.xml.head
M mh.c
M doc/manual.xml.head => doc/manual.xml.head +19 -19
@@ 7767,25 7767,6 @@ 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">


@@ 7864,6 7845,25 @@ set spoolfile = "/var/mail/user"
echo (if (equal $spoolfile "/var/mail/user") yes no)
  ==> "yes"
</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>
  </sect2>


M mh.c => mh.c +12 -1
@@ 2334,9 2334,20 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
        if (ctx->hdrs[i]->deleted != p->h->deleted)
        {
          ctx->hdrs[i]->deleted = p->h->deleted;
          if (ctx->hdrs[i]->deleted)
            ctx->deleted++;
          else
            ctx->deleted--;
          flags_changed = 1;
        }
      ctx->hdrs[i]->trash = p->h->trash;
      if (ctx->hdrs[i]->trash != p->h->trash)
      {
        ctx->hdrs[i]->trash = p->h->trash;
        if (ctx->hdrs[i]->trash)
          ctx->trashed++;
        else
          ctx->trashed--;
      }

      /* this is a duplicate of an existing header, so remove it */
      mutt_free_header (&p->h);