]> granicus.if.org Git - neomutt/commitdiff
merge: compress
authorRichard Russon <rich@flatcap.org>
Sun, 22 May 2016 15:52:38 +0000 (16:52 +0100)
committerRichard Russon <rich@flatcap.org>
Sun, 22 May 2016 15:52:38 +0000 (16:52 +0100)
 * feature: compress
 * fix code to match latest version of mutt
 * add docs
 * add ident to PATCHES
 * conditional build
 * reorder - static first
 * renames
 * whitespace
 * style - {}s, pointers, etc
 * comments
 * doc: check for installed patches

13 files changed:
1  2 
Makefile.am
PATCHES
configure.ac
curs_main.c
doc/manual.xml.head
hook.c
init.h
mbox.c
mutt.h
mx.c
mx.h
status.c
version.c

diff --cc Makefile.am
index 547a5773aa472a2287c90de02424d35d6bb571d0,d36e7c6318f80574838e3bdb6ba39dd188c22ff6..3ce816ef7ec2c44c46cb03ad3f1f9b68e333a945
@@@ -81,21 -77,10 +81,25 @@@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP 
  
  EXTRA_SCRIPTS = smime_keys
  
 +if BUILD_SIDEBAR
 +mutt_SOURCES += sidebar.c sidebar.h
 +endif
 +
 +EXTRA_DIST += OPS.SIDEBAR
 +
 +if BUILD_NOTMUCH
 +mutt_SOURCES += mutt_notmuch.c mutt_notmuch.h
 +mutt_LDADD += $(NOTMUCH_LIBS)
 +endif
 +
 +# kz
 +EXTRA_DIST += UPDATING.kz README.notmuch OPS.NOTMUCH
 +
 +
+ if BUILD_COMPRESS
+ mutt_SOURCES += compress.c compress.h
+ endif
  
  mutt_dotlock_SOURCES = mutt_dotlock.c
  mutt_dotlock_LDADD = $(LIBOBJS)
diff --cc PATCHES
index a1cd1f56f39a65ba9a328ed383d86d8ed461b267,1fbac870b94902f116a0102f16e6504c6034a110..dab0e5e6aa0c528ca9d81161eacdfbdc8689d1aa
+++ b/PATCHES
@@@ -1,14 -1,1 +1,15 @@@
 +patch-quasi-delete-neo-UNKNOWN
 +patch-progress-neo-UNKNOWN
 +patch-status-color-neo-UNKNOWN
 +patch-index-color-neo-UNKNOWN
 +patch-nested-if-neo-UNKNOWN
 +patch-cond-date-neo-UNKNOWN
 +patch-tls-sni-neo-UNKNOWN
 +patch-sidebar-neo-UNKNOWN
 +patch-ifdef-neo-UNKNOWN
 +patch-fmemopen-neo-UNKNOWN
 +patch-initials-neo-UNKNOWN
 +patch-trash-neo-UNKNOWN
 +patch-limit-current-thread-neo-UNKNOWN
 +patch-skip-quoted-neo-UNKNOWN
+ patch-compress-neo-UNKNOWN
diff --cc configure.ac
index 4c83742b11d8ea04db5cbf126ab5d4a37d75d595,6f2d63c555ec1763f46965e95ba0c93908afaa10..4322b424bcea0aa1efa2bc47cd3087d7c6d72b7f
@@@ -175,40 -175,14 +175,48 @@@ if test x$have_smime != xno ; the
        SMIMEAUX_TARGET="smime_keys"
  fi
  
 +AC_ARG_ENABLE(sidebar, AC_HELP_STRING([--enable-sidebar], [Enable Sidebar support]),
 +[       if test x$enableval = xyes ; then
 +              AC_DEFINE(USE_SIDEBAR,1,[ Define if you want support for the sidebar. ])
 +              OPS="$OPS \$(srcdir)/OPS.SIDEBAR"
 +              need_sidebar="yes"
 +        fi
 +])
 +AM_CONDITIONAL(BUILD_SIDEBAR, test x$need_sidebar = xyes)
 +
 +AC_ARG_ENABLE(notmuch, AC_HELP_STRING([--enable-notmuch], [Enable NOTMUCH support]),
 +[       if test x$enableval = xyes ; then
 +              AC_CHECK_LIB(notmuch, notmuch_database_open,,
 +                      AC_MSG_ERROR([Unable to find Notmuch library]))
 +              AC_DEFINE(USE_NOTMUCH,1,[ Define if you want support for the notmuch. ])
 +              NOTMUCH_LIBS="-lnotmuch"
 +              OPS="$OPS \$(srcdir)/OPS.NOTMUCH"
 +              need_notmuch="yes"
 +
 +              AC_MSG_CHECKING([for notmuch api version 3])
 +              AC_COMPILE_IFELSE( [AC_LANG_PROGRAM(
 +                                      [[#include <notmuch.h>]],
 +                                      [[notmuch_database_open("/path", NOTMUCH_DATABASE_MODE_READ_ONLY, (notmuch_database_t**)NULL);]]
 +                                      )],
 +              [notmuch_api_3=yes
 +                      AC_DEFINE([NOTMUCH_API_3], 1, [Define to 1 if you have the notmuch api version 3.])
 +                      ],
 +              [notmuch_api_3=no]
 +              )
 +              AC_MSG_RESULT([$notmuch_api_3])
 +        fi
 +])
 +AM_CONDITIONAL(BUILD_NOTMUCH, test x$need_notmuch = xyes)
 +
 +
+ AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]),
+ [       if test x$enableval = xyes ; then
+                 AC_DEFINE(USE_COMPRESSED,1, [ Define to enable compressed folders support. ])
+               need_compress="yes"
+         fi
+ ])
+ AM_CONDITIONAL(BUILD_COMPRESS, test x$need_compress = xyes)
  AC_ARG_WITH(mixmaster, AS_HELP_STRING([--with-mixmaster@<:@=PATH@:>@],[Include Mixmaster support]),
    [if test "$withval" != no
     then
diff --cc curs_main.c
index 64052d1274fe1e5aee7e52a9fdfb0f30604897d1,6ae63b68de9959bf50afa4c2a53e5debb4355ab4..0924ec54d78ff72eef72fc971d859043fdbb156d
@@@ -488,176 -477,6 +488,181 @@@ static void resort_index (MUTTMENU *men
    menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
  }
  
 +/**
 + * mutt_draw_statusline - XXX
 + */
 +void
 +mutt_draw_statusline (int cols, char *inbuf)
 +{
 +      int i          = 0;
 +      int cnt        = 0;
 +      int last_color = 0;
 +      int color      = 0;
 +      int offset     = 0;
 +      int found      = 0;
 +      int null_rx    = 0;
 +      char buf[2048];
 +
 +      struct line_t {
 +              short chunks;
 +              struct syntax_t {
 +                      int color;
 +                      int first;
 +                      int last;
 +              } *syntax;
 +      } lineInfo = { 0, NULL };
 +
 +      mutt_format_string (buf, sizeof (buf), cols, cols, 0, ' ', inbuf, mutt_strlen (inbuf), 0);
 +
 +      lineInfo.syntax = safe_malloc (sizeof (struct syntax_t));
 +      lineInfo.syntax[0].first = -1;
 +      lineInfo.syntax[0].last  = -1;
 +      lineInfo.syntax[0].color = ColorDefs[MT_COLOR_STATUS];
 +      lineInfo.chunks = 1;
 +
 +      do {
 +              found = 0;
 +              null_rx = 0;
 +              COLOR_LINE *color_line = ColorStatusList;
 +
 +              if (!buf[offset])
 +                      break;
 +
 +              while (color_line) {
 +                      regmatch_t pmatch[color_line->match + 1];
 +
 +                      if (regexec (&color_line->rx, buf + offset, color_line->match + 1, pmatch, (offset ? REG_NOTBOL : 0)) == 0) {
 +                              if (pmatch[color_line->match].rm_eo != pmatch[color_line->match].rm_so) {
 +                                      if (!found) {
 +                                              if (++(lineInfo.chunks) > 1) {
 +                                                      safe_realloc (&(lineInfo.syntax), (lineInfo.chunks) * sizeof (struct syntax_t));
 +                                              }
 +                                      }
 +                                      i = lineInfo.chunks - 1;
 +                                      pmatch[color_line->match].rm_so += offset;
 +                                      pmatch[color_line->match].rm_eo += offset;
 +                                      if (!found ||
 +                                              (pmatch[color_line->match].rm_so < (lineInfo.syntax)[i].first) ||
 +                                              ((pmatch[color_line->match].rm_so == (lineInfo.syntax)[i].first) &&
 +                                              (pmatch[color_line->match].rm_eo > (lineInfo.syntax)[i].last))) {
 +                                              (lineInfo.syntax)[i].color = color_line->pair;
 +                                              (lineInfo.syntax)[i].first = pmatch[color_line->match].rm_so;
 +                                              (lineInfo.syntax)[i].last = pmatch[color_line->match].rm_eo;
 +                                      }
 +                                      found = 1;
 +                                      null_rx = 0;
 +                              } else {
 +                                      null_rx = 1; /* empty regexp; don't add it, but keep looking */
 +                              }
 +                      }
 +                      color_line = color_line->next;
 +              }
 +
 +              if (null_rx)
 +                      offset++; /* avoid degenerate cases */
 +              else
 +                      offset = (lineInfo.syntax)[i].last;
 +      } while (found || null_rx);
 +
 +      for (cnt = 0; cnt < mutt_strlen (buf); cnt++) {
 +              color = lineInfo.syntax[0].color;
 +              for (i = 0; i < lineInfo.chunks; i++) {
 +                      /* we assume the chunks are sorted */
 +                      if (cnt > (lineInfo.syntax)[i].last)
 +                              continue;
 +                      if (cnt < (lineInfo.syntax)[i].first)
 +                              break;
 +                      if (cnt != (lineInfo.syntax)[i].last) {
 +                              color = (lineInfo.syntax)[i].color;
 +                              break;
 +                      }
 +                      /* don't break here, as cnt might be in the next chunk as well */
 +              }
 +              if (color != last_color) {
 +                      attrset (color);
 +                      last_color = color;
 +              }
 +              /* XXX more than one char at a time? */
 +              addch ((unsigned char)buf[cnt]);
 +#if 0
 +              waddnstr (stdscr, tgbuf, 10);
 +              SETCOLOR (MT_COLOR_NORMAL);
 +              waddnstr (stdscr, tgbuf + 10, -1);
 +#endif
 +      }
 +
 +      safe_free (&lineInfo.syntax);
 +}
 +
 +static int main_change_folder(MUTTMENU *menu, int op, char *buf, size_t bufsz,
 +                        int *oldcount, int *index_hint)
 +{
 +  mutt_expand_path (buf, bufsz);
 +#ifdef USE_SIDEBAR
 +  sb_set_open_buffy (buf);
 +#endif
 +  if (mx_get_magic (buf) <= 0)
 +  {
 +    mutt_error (_("%s is not a mailbox."), buf);
 +    return -1;
 +  }
 +  mutt_str_replace (&CurrentFolder, buf);
 +
 +  /* keepalive failure in mutt_enter_fname may kill connection. #3028 */
 +  if (Context && !Context->path)
 +    FREE (&Context);
 +
 +  if (Context)
 +  {
 +    int check;
 +
++#ifdef USE_COMPRESSED
++        if (Context->compress_info && Context->realpath)
++          mutt_str_replace (&LastFolder, Context->realpath);
++        else
++#endif
 +    mutt_str_replace (&LastFolder, Context->path);
 +    *oldcount = Context ? Context->msgcount : 0;
 +
 +    if ((check = mx_close_mailbox (Context, index_hint)) != 0)
 +    {
 +      if (check == M_NEW_MAIL || check == M_REOPENED)
 +        update_index (menu, Context, check, *oldcount, *index_hint);
 +
 +      set_option (OPTSEARCHINVALID);
 +      menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
 +      return 0;
 +    }
 +    FREE (&Context);
 +  }
 +
 +  mutt_sleep (0);
 +
 +  /* Set CurrentMenu to MENU_MAIN before executing any folder
 +   * hooks so that all the index menu functions are available to
 +   * the exec command.
 +   */
 +
 +  CurrentMenu = MENU_MAIN;
 +  mutt_folder_hook (buf);
 +
 +  if ((Context = mx_open_mailbox (buf,
 +              (option (OPTREADONLY) || op == OP_MAIN_CHANGE_FOLDER_READONLY) ?
 +              M_READONLY : 0, NULL)) != NULL)
 +  {
 +    menu->current = ci_first_message ();
 +  }
 +  else
 +    menu->current = 0;
 +
 +  mutt_clear_error ();
 +  mutt_buffy_check(1); /* force the buffy check after we have changed the folder */
 +  menu->redraw = REDRAW_FULL;
 +  set_option (OPTSEARCHINVALID);
 +
 +  return 0;
 +}
 +
  static const struct mapping_t IndexHelp[] = {
    { N_("Quit"),  OP_QUIT },
    { N_("Del"),   OP_DELETE },
index 1d26cfb8bfd1e0359d4bc1bad6f02f3d4c04d639,4b3414a7b9994189101a2d19d2f993dc89870775..c09ee48393b9ea4b5a47f62f6f9141d290f4404e
@@@ -8863,2582 -8167,325 +8881,2959 @@@ please have a look at the mixmaster doc
        </sect2>
  -->
  
 -      <sect2 id="compress-commands">
 -              <title>Commands</title>
 -              <cmdsynopsis>
 -                      <command>open-hook</command>
 -                      <arg choice="plain">
 -                              <replaceable class="parameter">pattern</replaceable>
 -                      </arg>
 -                      <arg choice="plain">
 -                              <replaceable class="parameter">shell-command</replaceable>
 -                      </arg>
 -                      <command>close-hook</command>
 -                      <arg choice="plain">
 -                              <replaceable class="parameter">pattern</replaceable>
 -                      </arg>
 +      <sect2 id="quasi-delete-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'quasi-delete' feature.
 + 
 +# The 'quasi-delete' function marks an email that should be hidden
 +# from the index, but NOT deleted.</emphasis>
 +bind index,pager Q quasi-delete
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="quasi-delete-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="notmuch">notmuch patch</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="quasi-delete-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="quasi-delete-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Karel Zak <email>kzak@redhat.com</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="progress">
 +      <title>Progress Bar Patch</title>
 +      <subtitle>Show a visual progress bar on slow operations</subtitle>
 +
 +      <sect2 id="progress-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Progress Bar</quote>, look for
 +                      <quote>patch-progress</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="progress-intro">
 +              <title>Introduction</title>
 +
 +        <para>
 +              The <quote>progress</quote> patch shows a visual progress bar on slow
 +              tasks, such as indexing a large folder over the net.
 +        </para>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="progress-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="progress-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="progress-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="progress-colors">
 +              <title>Colors</title>
 +              <table id="table-progress-colors">
 +                      <title>Progress Colors</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Name</entry>
 +                                              <entry>Default Color</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>progress</literal></entry>
 +                                              <entry>default</entry>
 +                                              <entry>Visual progress bar</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="progress-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="progress-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'progress' patch.
 + 
 +# The 'progress' patch provides clear visual feedback for
 +# slow tasks, such as indexing a large folder over the net.
 + 
 +# Set the color of the progress bar
 +# White text on a red background</emphasis>
 +color progress white red
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="progress-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="color">Color command</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="progress-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="progress-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Rocco Rutte <email>pdmef@gmx.net</email></para></listitem>
 +              <listitem><para>Vincent Lefevre <email>vincent@vinc17.org</email></para></listitem>
 +              <listitem><para>Stefan Kuhn <email>wuodan@hispeed.ch</email></para></listitem>
 +              <listitem><para>Karel Zak <email>kzak@redhat.com</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="status-color">
 +      <title>Status Color Patch</title>
 +      <subtitle>Custom rules for theming the status bar</subtitle>
 +
 +      <sect2 id="status-color-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Status Color</quote>, look for
 +                      <quote>patch-status-color</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="status-color-intro">
 +              <title>Introduction</title>
 +
 +        <para>
 +              The <quote>status-color</quote> patch allows you to theme different
 +              parts of the status bar (also when it's used by the index).
 +        </para>
 +
 +        <para>
 +              Unlike normal color commands, <literal>color status</literal> can now
 +              take up to 2 extra parameters (regex, num).
 +        </para>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="status-color-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="status-color-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="status-color-commands">
 +              <title>Commands</title>
 +              <cmdsynopsis>
 +                      <command>color</command>
 +                      <arg choice="plain">
 +                              <option>status</option>
 +                      </arg>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">foreground</replaceable>
 +                      </arg>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">background</replaceable>
 +                      </arg>
 +                      <group choice="opt">
 +                              <arg choice="plain">
 +                                      <replaceable class="parameter">regex</replaceable>
 +                              </arg>
 +                              <group choice="opt">
 +                                      <arg choice="plain">
 +                                              <replaceable class="parameter">num</replaceable>
 +                                      </arg>
 +                              </group>
 +                      </group>
 +              </cmdsynopsis>
 +
 +              <para>
 +                      With zero parameters, Mutt will set the default color for the entire
 +                      status bar.
 +              </para>
 +
 +              <para>
 +                      With one parameter, Mutt will only color the parts matching the
 +                      regex.
 +              </para>
 +
 +              <para>
 +                      With two parameters, Mutt will only color the num'th sub-match of
 +                      the regex.
 +              </para>
 +      </sect2>
 +
 +      <sect2 id="status-color-colors">
 +              <title>Colors</title>
 +
 +              <table id="table-status-color-colors">
 +                      <title>Status Colors</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Name</entry>
 +                                              <entry>Default Color</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>status</entry>
 +                                              <entry><literal>reverse</literal></entry>
 +                                              <entry>Status bar</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="status-color-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="status-color-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'status-color' patch.
 + 
 +# The 'status-color' patch allows you to theme different parts of
 +# the status bar (also when it's used by the index).
 + 
 +# For the examples below, set some defaults</emphasis>
 +set status_format='-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%&gt;-(%P)---'
 +set index_format='%4C %Z %{%b %d} %-15.15L (%?l?%4l&amp;%4c?) %s'
 +set sort=threads
 +set sort_aux=last-date-received
 + 
 +<emphasis role="comment"># 'status color' can take up to 2 extra parameters
 + 
 +# color status foreground background [ regex [ num ]]
 + 
 +# 0 extra parameters
 +# Set the default color for the entire status line</emphasis>
 +color status blue white
 + 
 +<emphasis role="comment"># 1 extra parameter
 +# Set the color for a matching pattern
 +# color status foreground background regexp
 + 
 +# Highlight New, Deleted, or Flagged emails</emphasis>
 +color status brightred white '(New|Del|Flag):[0-9]+'
 + 
 +<emphasis role="comment"># Highlight mailbox ordering if it's different from the default
 +# First, highlight anything (*/*)</emphasis>
 +color status brightred default '\([^)]+/[^)]+\)'
 + 
 +<emphasis role="comment"># Then override the color for one specfic case</emphasis>
 +color status default   default '\(threads/last-date-received\)'
 + 
 +<emphasis role="comment"># 2 extra parameters
 +# Set the color for the nth submatch of a pattern
 +# color status foreground background regexp num
 + 
 +# Highlight the contents of the []s but not the [] themselves</emphasis>
 +color status red default '\[([^]]+)\]' 1
 + 
 +<emphasis role="comment"># The '1' refers to the first regex submatch, which is the inner
 +# part in ()s
 + 
 +# Highlight the mailbox</emphasis>
 +color status brightwhite default 'Mutt: ([^ ]+)' 1
 + 
 +<emphasis role="comment"># Search for 'Mutt: ' but only highlight what comes after it
 + 
 +# vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="status-color-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="compile-time-features">Compile-Time Features</link></para></listitem>
 +                      <listitem><para><link linkend="regexp">Regular Expressions</link></para></listitem>
 +                      <listitem><para><link linkend="patterns">Patterns</link></para></listitem>
 +                      <listitem><para><link linkend="index-color">index-color patch</link></para></listitem>
 +                      <listitem><para><link linkend="color">Color command</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="status-color-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="status-color-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>David Sterba <email>dsterba@suse.cz</email></para></listitem>
 +              <listitem><para>Thomas Glanzmann <email>thomas@glanzmann.de</email></para></listitem>
 +              <listitem><para>Kirill A. Shutemov <email>kirill@shutemov.name</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="index-color">
 +      <title>Index Color Patch</title>
 +      <subtitle>Custom rules for theming the email index</subtitle>
 +
 +      <sect2 id="index-color-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Index Color</quote>, look for
 +                      <quote>patch-index-color</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +                      <listitem><para><link linkend="status-color">status-color patch</link></para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="index-color-intro">
 +              <title>Introduction</title>
 +
 +        <para>
 +              The <quote>index-color</quote> patch allows you to specify colors for
 +              individual parts of the email index. e.g. Subject, Author, Flags.
 +        </para>
 +
 +        <para>
 +              First choose which part of the index you'd like to color.
 +              Then, if needed, pick a pattern to match.
 +        </para>
 +
 +              <para>
 +              Note: The pattern does not have to refer to the object you wish to
 +              color.  e.g.
 +              </para>
 +
 +<screen>
 +color index_author red default &quot;~smutt&quot;
 +</screen>
 +
 +        <para>
 +              The author appears red when the subject (~s) contains <quote>mutt</quote>.
 +        </para>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="index-color-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="index-color-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="index-color-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="index-color-colors">
 +              <title>Colors</title>
 +
 +        <para>
 +              All the colors default to <literal>default</literal>, i.e. unset.
 +        </para>
 +
 +        <para>
 +              The index objects can be themed using the <literal>color</literal> command.
 +              Some objects require a pattern.
 +        </para>
 +
 +<screen>
 +color index-object foreground background
 +color index-object foreground background pattern
 +</screen>
 +
 +              <table id="table-index-color-colors">
 +                      <title>Index Colors</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Object</entry>
 +                                              <entry>Pattern</entry>
 +                                              <entry>Highlights</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>index</literal></entry>
 +                                              <entry>yes</entry>
 +                                              <entry>Entire index line</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_author</literal></entry>
 +                                              <entry>yes</entry>
 +                                              <entry>Author name, %A %a %F %L %n</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_collapsed</literal></entry>
 +                                              <entry>no</entry>
 +                                              <entry>Number of messages in a collapsed thread, %M</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_date</literal></entry>
 +                                              <entry>no</entry>
 +                                              <entry>Date field</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_flags</literal></entry>
 +                                              <entry>yes</entry>
 +                                              <entry>Message flags, %S %Z</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_label</literal></entry>
 +                                              <entry>no</entry>
 +                                              <entry>Message label, %y %Y</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_number</literal></entry>
 +                                              <entry>no</entry>
 +                                              <entry>Message number, %C</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_size</literal></entry>
 +                                              <entry>no</entry>
 +                                              <entry>Message size, %c %l</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>index_subject</literal></entry>
 +                                              <entry>yes</entry>
 +                                              <entry>Subject, %s</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="index-color-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="index-color-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'index-color' feature.
 + 
 +# Entire index line</emphasis>
 +color index white black '.*'
 + 
 +<emphasis role="comment"># Author name, %A %a %F %L %n
 + 
 +# Give the author column a dark grey background</emphasis>
 +color index_author default color234 '.*'
 + 
 +<emphasis role="comment"># Highlight a particular from (~f)</emphasis>
 +color index_author brightyellow color234 '~fRay Charles'
 + 
 +<emphasis role="comment"># Message flags, %S %Z
 +# Highlight the flags for flagged (~F) emails</emphasis>
 +color index_flags default red '~F'
 + 
 +<emphasis role="comment"># Subject, %s
 +# Look for a particular subject (~s)</emphasis>
 +color index_subject brightcyan default '~s\(closes #[0-9]+\)'
 + 
 +<emphasis role="comment"># Number of messages in a collapsed thread, %M</emphasis>
 +color index_collapsed default brightblue
 + 
 +<emphasis role="comment"># Date field</emphasis>
 +color index_date green default
 + 
 +<emphasis role="comment"># Message label, %y %Y</emphasis>
 +color index_label default brightgreen
 + 
 +<emphasis role="comment"># Message number, %C</emphasis>
 +color index_number red default
 + 
 +<emphasis role="comment"># Message size, %c %l</emphasis>
 +color index_size cyan default
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="index-color-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="regexp">Regular Expressions</link></para></listitem>
 +                      <listitem><para><link linkend="patterns">Patterns</link></para></listitem>
 +                      <listitem><para><link linkend="index-format">$index_format</link></para></listitem>
 +                      <listitem><para><link linkend="color">Color command</link></para></listitem>
 +                      <listitem><para><link linkend="status-color">Status-Color patch</link></para></listitem>
 +                      <listitem><para><link linkend="keywords">Keywords patch</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="index-color-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="index-color-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Christian Aichinger <email>Greek0@gmx.net</email></para></listitem>
 +              <listitem><para>Christoph <quote>Myon</quote> Berg <email>myon@debian.org</email></para></listitem>
 +              <listitem><para>Elimar Riesebieter <email>riesebie@lxtec.de</email></para></listitem>
 +              <listitem><para>Eric Davis <email>edavis@insanum.com</email></para></listitem>
 +              <listitem><para>Vladimir Marek <email>Vladimir.Marek@oracle.com</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="nested-if">
 +      <title>Nested If Patch</title>
 +      <subtitle>Allow complex nested conditions in format strings</subtitle>
 +
 +      <sect2 id="nested-if-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Nested If</quote>, look for
 +                      <quote>patch-nested-if</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="nested-if-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +                      Mutt's format strings can contain embedded if-then-else conditions.
 +                      They are of the form:
 +              </para>
 +
 +<screen>
 +%?VAR?TRUE&amp;FALSE?
 +</screen>
 +
 +              <para>
 +                      If the variable <quote>VAR</quote> has a value greater than zero,
 +                      print the <quote>TRUE</quote> string, otherwise print the
 +                      <quote>FALSE</quote> string.
 +              </para>
 +
 +              <para>
 +                      e.g.  <literal>%?S?Size: %S&amp;Empty?</literal>
 +              </para>
 +
 +              <para>Which can be read as:</para>
 +
 +              <literallayout>
 +                  if (%S &gt; 0) {
 +                      print &quot;Size: %S&quot;
 +                  } else {
 +                      print &quot;Empty&quot;
 +                  }
 +              </literallayout>
 +
 +              <para>
 +                      These conditions are useful, but in Mutt they cannot be nested
 +                      within one another.  This patch uses the notation
 +                      <literal>%&lt;VAR?TRUE&amp;FALSE&gt;</literal> and allows them to be nested.
 +              </para>
 +
 +              <para>
 +                      The <literal>%&lt;...&gt;</literal> notation was used to format the
 +                      current local time.  but that's not really very useful since mutt
 +                      has no means of refreshing the screen periodically.
 +              </para>
 +
 +              <para>
 +                      A simple nested condition might be:
 +                      (Some whitespace has been introduced for clarity)
 +              </para>
 +
 +              <literallayout>
 +                  %&lt;x? %&lt;y? XY &amp; X &gt; &amp; %&lt;y? Y &amp; NONE &gt; &gt;  Conditions
 +                       %&lt;y? XY &amp; X &gt;                      x&gt;0
 +                            XY                            x&gt;0,y&gt;0
 +                                 X                        x&gt;0,y=0
 +              </literallayout>
 +
 +              <literallayout>
 +                  %&lt;x? %&lt;y? XY &amp; X &gt; &amp; %&lt;y? Y &amp; NONE &gt; &gt;  Conditions
 +                                       %&lt;y? Y &amp; NONE &gt;    x=0
 +                                            Y             x=0,y&gt;0
 +                                                NONE      x=0,y=0
 +              </literallayout>
 +
 +              <para>Equivalent to:</para>
 +
 +              <literallayout>
 +                  if (x &gt; 0) {
 +                      if (y &gt; 0) {
 +                          print 'XY'
 +                      } else {
 +                          print 'X'
 +                      }
 +                  } else {
 +                      if (y &gt; 0) {
 +                          print 'Y'
 +                      } else {
 +                          print 'NONE'
 +                      }
 +                  }
 +              </literallayout>
 +
 +              <para>Examples:</para>
 +
 +<screen>
 +set index_format='%4C %Z %{%b %d} %-25.25n %s%&gt; %&lt;M?%M Msgs &amp;%&lt;l?%l Lines&amp;%c Bytes&gt;&gt;'
 +</screen>
 +
 +              <literallayout>
 +                  if a thread is folded
 +                      display the number of messages (%M)
 +                  else if we know how many lines in the message
 +                      display lines in message (%l)
 +                  else
 +                      display the size of the message in bytes (%c)
 +              </literallayout>
 +
 +<screen>
 +set index_format='%4C %Z %{%b %d} %-25.25n %&lt;M?[%M] %s&amp;%s%* %&lt;l?%l&amp;%c&gt;&gt;'
 +</screen>
 +
 +              <literallayout>
 +                  if a thread is folded
 +                      display the number of messages (%M)
 +                      display the subject (%s)
 +                  else if we know how many lines in the message
 +                      display lines in message (%l)
 +                  else
 +                      display the size of the message in bytes (%c)
 +              </literallayout>
 +
 +      </sect2>
 +
 +      <sect2 id="nested-if-variables">
 +              <title>Variables</title>
 +              The <quote>nested-if</quote> patch doesn't have any config of its own.
 +              It modifies the behavior of the format strings.
 +      </sect2>
 +
 +<!--
 +      <sect2 id="nested-if-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="nested-if-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="nested-if-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="nested-if-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="nested-if-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'nested-if' feature.
 + 
 +# This patch uses the format: '%&lt;VAR?TRUE&amp;FALSE&gt;' for conditional
 +# format strings that can be nested.
 + 
 +# Example 1
 +# if a thread is folded
 +#       display the number of messages (%M)
 +# else if we know how many lines in the message
 +#       display lines in message (%l)
 +# else display the size of the message in bytes (%c)</emphasis>
 +set index_format='%4C %Z %{%b %d} %-25.25n %s%&gt; %&lt;M?%M Msgs &amp;%&lt;l?%l Lines&amp;%c Bytes&gt;&gt;'
 + 
 +<emphasis role="comment"># Example 2
 +# if a thread is folded
 +#       display the number of messages (%M)
 +#       display the subject (%s)
 +# else if we know how many lines in the message
 +#       display lines in message (%l)
 +# else
 +#       display the size of the message in bytes (%c)</emphasis>
 +set index_format='%4C %Z %{%b %d} %-25.25n %&lt;M?[%M] %s&amp;%s%* %&lt;l?%l&amp;%c&gt;&gt;'
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="nested-if-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="cond-date">cond-date patch</link></para></listitem>
 +                      <listitem><para><link linkend="index-format">$index_format</link></para></listitem>
 +                      <listitem><para><link linkend="status-format">$status_format</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="nested-if-known-bugs">
 +              <title>Known Bugs</title>
 +              Patch overwrites $&lt;fmt&gt; handler in <literal>$index_format</literal>
 +      </sect2>
 +
 +      <sect2 id="nested-if-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>David Champion <email>dgc@uchicago.edu</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="cond-date">
 +      <title>Conditional Dates Patch</title>
 +      <subtitle>Use rules to choose date format</subtitle>
 +
 +      <sect2 id="cond-date-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Conditional Dates</quote>, look for
 +                      <quote>patch-cond-date</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +                      <listitem><para><link linkend="nested-if">nested-if patch</link></para></listitem>
 +              </itemizedlist>
 +
 +              <para>
 +                      This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.
 +              </para>
 +      </sect2>
 +
 +      <sect2 id="cond-date-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +              The <quote>cond-date</quote> patch allows you to construct
 +              <link linkend="index-format">$index_format</link> expressions based on the age of the email.
 +              </para>
 +
 +              <para>
 +              Mutt's default <literal>$index_format</literal> displays email dates in the
 +              form: abbreviated-month day-of-month &mdash; <quote>Jan 14</quote>.
 +              </para>
 +
 +              <para>
 +              The format is configurable but only per-mailbox.  This patch allows you
 +              to configure the display depending on the age of the email.
 +              </para>
 +
 +              <table id="table-cond-date-scheme">
 +                      <title>Potential Formatting Scheme</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Email Sent</entry>
 +                                              <entry>Format</entry>
 +                                              <entry>Example</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>Today</entry>
 +                                              <entry><literal>%H:%M</literal></entry>
 +                                              <entry>13:23</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>This Month</entry>
 +                                              <entry><literal>%a %d</literal></entry>
 +                                              <entry>Thu 17</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>This Year</entry>
 +                                              <entry><literal>%b %d</literal></entry>
 +                                              <entry>Dec 10</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>Older than 1 Year</entry>
 +                                              <entry><literal>%m/%y</literal></entry>
 +                                              <entry>06/14</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +
 +              <para>
 +        For an explanation of the date formatting strings, see
 +        <literal>strftime(3).</literal>
 +              </para>
 +
 +              <para>
 +        By carefully picking your formats, the dates can remain
 +        unambiguous and compact.
 +              </para>
 +
 +              <para>
 +              Mutt's conditional format strings have the form:
 +              (whitespace introduced for clarity)
 +              </para>
 +
 +              <screen>%? TEST ? TRUE &amp; FALSE ?</screen>
 +
 +              <para>
 +              The examples below use the test <quote>%[</quote> &mdash; the date
 +              of the message in the local timezone.  They will also work with
 +              <quote>%(</quote> &mdash; the local time that the message arrived.
 +              </para>
 +
 +              <para>
 +              The date tests are of the form:
 +              </para>
 +
 +              <screen>%[nX? TRUE &amp; FALSE ?</screen>
 +
 +              <itemizedlist>
 +              <listitem><para><quote>n</quote> is an optional count (defaults to 1 if missing)</para></listitem>
 +              <listitem><para><quote>X</quote> is the time period</para></listitem>
 +              </itemizedlist>
 +
 +              <table id="table-cond-date-format-codes">
 +                      <title>Date Formatting Codes</title>
 +                      <tgroup cols="2">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Letter</entry>
 +                                              <entry>Time Period</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>y</entry>
 +                                              <entry>Years</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>m</entry>
 +                                              <entry>Months</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>w</entry>
 +                                              <entry>Weeks</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>d</entry>
 +                                              <entry>Days</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>H</entry>
 +                                              <entry>Hours</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>M</entry>
 +                                              <entry>Minutes</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +
 +              <table id="table-cond-date-example-tests">
 +                      <title>Example Date Tests</title>
 +                      <tgroup cols="2">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Test</entry>
 +                                              <entry>Meaning</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>%[y</literal></entry>
 +                                              <entry>This year</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>%[1y</literal></entry>
 +                                              <entry>This year</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>%[6m</literal></entry>
 +                                              <entry>In the last 6 months</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>%[w</literal></entry>
 +                                              <entry>This week</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>%[d</literal></entry>
 +                                              <entry>Today</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>%[4H</literal></entry>
 +                                              <entry>In the last 4 hours</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +
 +              <sect3 id="cond-date-example1">
 +                      <title>Example 1</title>
 +
 +                      <para>We start with a one-condition test.</para>
 +
 +                      <table id="table-cond-date-example1">
 +                              <title>Example 1</title>
 +                              <tgroup cols="4">
 +                                      <thead>
 +                                              <row>
 +                                                      <entry>Test</entry>
 +                                                      <entry>Date Range</entry>
 +                                                      <entry>Format String</entry>
 +                                                      <entry>Example</entry>
 +                                              </row>
 +                                      </thead>
 +                                      <tbody>
 +                                              <row>
 +                                                      <entry><literal>%[1m</literal></entry>
 +                                                      <entry>This month</entry>
 +                                                      <entry><literal>%[%b %d]</literal></entry>
 +                                                      <entry>Dec 10</entry>
 +                                              </row>
 +                                              <row>
 +                                                      <entry></entry>
 +                                                      <entry>Older</entry>
 +                                                      <entry><literal>%[%Y-%m-%d]</literal></entry>
 +                                                      <entry>2015-04-23</entry>
 +                                              </row>
 +                                      </tbody>
 +                              </tgroup>
 +                      </table>
 +
 +                      <para>The $index_format string would contain:</para>
 +<screen>
 +%?[1m?%[%b %d]&amp;%[%Y-%m-%d]?
 +</screen>
 + 
 +                      <para>
 +                              Reparsed a little, for clarity, you can see the
 +                              test condition and the two format strings.
 +                      </para>
 +
 +<screen>
 +%?[1m?        &amp;           ?
 +      %[%b %d] %[%Y-%m-%d]
 +</screen>
 +
 +              </sect3>
 +
 +              <sect3 id="cond-date-example2">
 +                      <title>Example 2</title>
 +
 +                      <para>
 +                      This example contains three test conditions and four date formats.
 +                      </para>
 +
 +                      <table id="table-cond-date-example2">
 +                              <title>Example 2</title>
 +                              <tgroup cols="4">
 +                                      <thead>
 +                                              <row>
 +                                                      <entry>Test</entry>
 +                                                      <entry>Date Range</entry>
 +                                                      <entry>Format String</entry>
 +                                                      <entry>Example</entry>
 +                                              </row>
 +                                      </thead>
 +                                      <tbody>
 +                                              <row>
 +                                                      <entry><literal>%[d</literal></entry>
 +                                                      <entry>Today</entry>
 +                                                      <entry><literal>%[%H:%M ] </literal></entry>
 +                                                      <entry>12:34</entry>
 +                                              </row>
 +                                              <row>
 +                                                      <entry><literal>%[m</literal></entry>
 +                                                      <entry>This month</entry>
 +                                                      <entry><literal>%[%a %d]</literal></entry>
 +                                                      <entry>Thu 12</entry>
 +                                              </row>
 +                                              <row>
 +                                                      <entry><literal>%[y</literal></entry>
 +                                                      <entry>This year</entry>
 +                                                      <entry><literal>%[%b %d]</literal></entry>
 +                                                      <entry>Dec 10</entry>
 +                                              </row>
 +                                              <row>
 +                                                      <entry></entry>
 +                                                      <entry>Older</entry>
 +                                                      <entry><literal>%[%m/%y ]</literal></entry>
 +                                                      <entry>06/15</entry>
 +                                              </row>
 +                                      </tbody>
 +                              </tgroup>
 +                      </table>
 +
 +                      <para>The $index_format string would contain:</para>
 + 
 +<screen>
 +%&lt;[y?%&lt;[m?%&lt;[d?%[%H:%M ]&amp;%[%a %d]&gt;&amp;%[%b %d]&gt;&amp;%[%m/%y ]&gt;
 +</screen>
 +
 +                      <para>
 +                              Reparsed a little, for clarity, you can see the
 +                              test conditions and the four format strings.
 +                      </para>
 +
 +<screen>
 +%&lt;[y?                                       &amp;%[%m/%y ]&gt;  Older
 +     %&lt;[m?                        &amp;%[%b %d]&gt;             This year
 +          %&lt;[d?         &amp;%[%a %d]&gt;                       This month
 +               %[%H:%M ]                                 Today
 +</screen>
 +
 +                      <para>
 +                      This a another view of the same example, with some whitespace
 +                      for clarity.
 +                      </para>
 +
 +<screen>
 +%&lt;[y? %&lt;[m? %&lt;[d? AAA &amp; BBB &gt; &amp; CCC &gt; &amp; DDD &gt;
 +</screen>
 +
 +                      <literallayout>
 +AAA = %[%H:%M ]
 +BBB = %[%a %d]
 +CCC = %[%b %d]
 +DDD = %[%m/%y ]
 +                      </literallayout>
 +              </sect3>
 +      </sect2>
 +
 +      <sect2 id="cond-date-variables">
 +              <title>Variables</title>
 +
 +        <para>
 +              The <quote>cond-date</quote> patch doesn't have any config of its own.
 +              It modifies the behavior of the format strings.
 +        </para>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="cond-date-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="cond-date-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="cond-date-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="cond-date-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="cond-date-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'index-color' feature.
 +#
 +# The default index_format is:
 +#       '%4C %Z %{%b %d} %-15.15L (%?l?%4l&amp;%4c?) %s'
 +#
 +# We replace the date field '%{%b %d}', giving:</emphasis>
 +set index_format='%4C %Z %&lt;[y?%&lt;[m?%&lt;[d?%[%H:%M ]&amp;%[%a %d]&gt;&amp;%[%b %d]&gt;&amp;%[%m/%y ]&gt; %-15.15L (%?l?%4l&amp;%4c?) %s'
 + 
 +<emphasis role="comment"># Test  Date Range  Format String  Example
 +# --------------------------------------------
 +# %[d   Today       %[%H:%M ]      12:34
 +# %[m   This month  %[%a %d]       Thu 12
 +# %[y   This year   %[%b %d]       Dec 10
 +# -     Older       %[%m/%y ]      06/15
 + 
 +# vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="cond-date-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="index-format">$index_format</link></para></listitem>
 +                      <listitem><para><link linkend="nested-if">nested-if patch</link></para></listitem>
 +                      <listitem><para><literal>strftime(3)</literal></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="cond-date-known-bugs">
 +              <title>Known Bugs</title>
 +
 +              <para>
 +                      Date parsing doesn't quite do what you expect.
 +                      <quote>1w</quote> doesn't mean the <quote>in the last 7 days</quote>, but
 +                      <quote><emphasis>this</emphasis> week</quote>.  This doesn't match
 +                      the normal Mutt behaviour: for example <literal>~d>1w</literal>
 +                      means emails dated in the last 7 days.
 +              </para>
 +
 +      </sect2>
 +
 +      <sect2 id="cond-date-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Aaron Schrab <email>aaron@schrab.com</email></para></listitem>
 +              <listitem><para>Eric Davis <email>edavis@insanum.com</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="tls-sni">
 +      <title>TLS-SNI Patch</title>
 +      <subtitle>Negotiate with a server for a TSL/SSL certificate</subtitle>
 +
 +      <sect2 id="tls-sni-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>TLS-SNI</quote>, look for
 +                      <quote>patch-tls-sni</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +                      <listitem><para>OpenSSL</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +              The <quote>TLS-SNI</quote> patch adds support for TLS virtual hosting.
 +              If your mail server doesn't support this everything will still work
 +              normally.
 +              </para>
 +
 +              <para>
 +              TLS supports sending the expected server hostname during the
 +              handshake, via the SNI extension.  This can be used to select a
 +              server certificate to issue to the client, permitting
 +              virtual-hosting without requiring multiple IP addresses.
 +              </para>
 +
 +              <para>
 +              This has been tested against Exim 4.80, which optionally logs SNI
 +              and can perform vhosting.
 +              </para>
 +
 +        <para>
 +              To verify TLS SNI support by a server, you can use:
 +        </para>
 +
 +<screen>
 +openssl s_client -host &lt;imap server&gt; -port &lt;port&gt; -tls1 -servername &lt;imap server&gt;
 +</screen>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="tls-sni-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="tls-sni-muttrc">
 +              <title>Muttrc</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="tls-sni-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Jeremy Katz <email>katzj@linuxpower.org</email></para></listitem>
 +              <listitem><para>Phil Pennock <email>mutt-dev@spodhuis.demon.nl</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="sidebar">
 +      <title>Sidebar Patch</title>
 +      <subtitle>Overview of mailboxes</subtitle>
 +
 +      <sect2 id="sidebar-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Sidebar</quote>, look for
 +                      <quote>+USE_SIDEBAR</quote> in the mutt version.
 +                      See: <xref linkend="compile-time-features"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="sidebar-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +                      The Sidebar shows a list of all your mailboxes.  The list can be
 +                      turned on and off, it can be themed and the list style can be
 +                      configured.
 +              </para>
 +
 +              <para>
 +                      This part of the manual is a reference guide.
 +                      If you want a simple introduction with examples see the
 +                      <link linkend="intro-sidebar">Sidebar Howto</link>.
 +                      If you just want to get started, you could use the sample
 +                      <link linkend="sidebar-muttrc">Sidebar muttrc</link>.
 +              </para>
 +
 +              <para>
 +                      This version of Sidebar is based on Terry Chan's
 +                      <ulink url="http://www.lunar-linux.org/mutt-sidebar/">2015-11-11 release</ulink>.
 +                      It contains many
 +                      <emphasis role="bold"><link linkend="intro-sidebar-features">new features</link></emphasis>,
 +                      lots of
 +                      <emphasis role="bold"><link linkend="intro-sidebar-bugfixes">bugfixes</link></emphasis>.
 +              </para>
 +      </sect2>
 +
 +      <sect2 id="sidebar-variables">
 +              <title>Variables</title>
 +
 +              <table id="table-sidebar-variables">
 +                      <title>Sidebar Variables</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Name</entry>
 +                                              <entry>Type</entry>
 +                                              <entry>Default</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>sidebar_delim_chars</literal></entry>
 +                                              <entry>string</entry>
 +                                              <entry><literal>/.</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_divider_char</literal></entry>
 +                                              <entry>string</entry>
 +                                              <entry><literal>|</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_folder_indent</literal></entry>
 +                                              <entry>boolean</entry>
 +                                              <entry><literal>no</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_format</literal></entry>
 +                                              <entry>string</entry>
 +                                              <entry><literal>%B%?F? [%F]?%* %?N?%N/?%S</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_indent_string</literal></entry>
 +                                              <entry>string</entry>
 +                                              <entry><literal>&nbsp;&nbsp;</literal> (two spaces)</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_new_mail_only</literal></entry>
 +                                              <entry>boolean</entry>
 +                                              <entry><literal>no</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_next_new_wrap</literal></entry>
 +                                              <entry>boolean</entry>
 +                                              <entry><literal>no</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_refresh_time</literal></entry>
 +                                              <entry>number</entry>
 +                                              <entry><literal>60</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_short_path</literal></entry>
 +                                              <entry>boolean</entry>
 +                                              <entry><literal>no</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_sort_method</literal></entry>
 +                                              <entry>enum</entry>
 +                                              <entry><literal>SORT_ORDER</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_visible</literal></entry>
 +                                              <entry>boolean</entry>
 +                                              <entry><literal>no</literal></entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_whitelist</literal></entry>
 +                                              <entry>list</entry>
 +                                              <entry>(empty)</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_width</literal></entry>
 +                                              <entry>number</entry>
 +                                              <entry><literal>20</literal></entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +      <sect2 id="sidebar-functions">
 +              <title>Functions</title>
 +
 +              <para>
 +                      Sidebar adds the following functions to Mutt.
 +                      By default, none of them are bound to keys.
 +              </para>
 +
 +              <table id="table-sidebar-functions">
 +                      <title>Sidebar Functions</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Menus</entry>
 +                                              <entry>Function</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-next&gt;</literal></entry>
 +                                              <entry>Move the highlight to next mailbox</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-next-new&gt;</literal></entry>
 +                                              <entry>Move the highlight to next mailbox with new mail</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-open&gt;</literal></entry>
 +                                              <entry>Open highlighted mailbox</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-page-down&gt;</literal></entry>
 +                                              <entry>Scroll the Sidebar down 1 page</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-page-up&gt;</literal></entry>
 +                                              <entry>Scroll the Sidebar up 1 page</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-prev&gt;</literal></entry>
 +                                              <entry>Move the highlight to previous mailbox</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-prev-new&gt;</literal></entry>
 +                                              <entry>Move the highlight to previous mailbox with new mail</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry><literal>&lt;sidebar-toggle-visible&gt;</literal></entry>
 +                                              <entry>Make the Sidebar (in)visible</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +      <sect2 id="sidebar-commands">
 +              <title>Commands</title>
 +              <cmdsynopsis>
 +                      <command>sidebar_whitelist</command>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">mailbox</replaceable>
 +                      </arg>
 +                      <arg choice="opt" rep="repeat">
 +                              <replaceable class="parameter">mailbox</replaceable>
 +                      </arg>
 +              </cmdsynopsis>
 +      </sect2>
 +
 +      <sect2 id="sidebar-colors">
 +              <title>Colors</title>
 +
 +              <table id="table-sidebar-colors">
 +                      <title>Sidebar Colors</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Name</entry>
 +                                              <entry>Default Color</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>sidebar_divider</literal></entry>
 +                                              <entry>default</entry>
 +                                              <entry>The dividing line between the Sidebar and the Index/Pager panels</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_flagged</literal></entry>
 +                                              <entry>default</entry>
 +                                              <entry>Mailboxes containing flagged mail</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_highlight</literal></entry>
 +                                              <entry>underline</entry>
 +                                              <entry>Cursor to select a mailbox</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_indicator</literal></entry>
 +                                              <entry>mutt <literal>indicator</literal></entry>
 +                                              <entry>The mailbox open in the Index panel</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_new</literal></entry>
 +                                              <entry>default</entry>
 +                                              <entry>Mailboxes containing new mail</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>sidebar_spoolfile</literal></entry>
 +                                              <entry>default</entry>
 +                                              <entry>Mailbox that receives incoming mail</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +
 +              If the <literal>sidebar_indicator</literal> color isn't set, then the default Mutt
 +              indicator color will be used (the color used in the index panel).
 +      </sect2>
 +
 +      <sect2 id="sidebar-sort">
 +              <title>Sort</title>
 +
 +              <table id="table-sidebar-sort">
 +                      <title>Sidebar Sort</title>
 +                      <tgroup cols="2">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Sort</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>alpha</literal></entry>
 +                                              <entry>Alphabetically by path</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>count</literal></entry>
 +                                              <entry>Total number of messages</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>flagged</literal></entry>
 +                                              <entry>Number of flagged messages</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>name</literal></entry>
 +                                              <entry>Alphabetically by path</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>new</literal></entry>
 +                                              <entry>Number of new messages</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>path</literal></entry>
 +                                              <entry>Alphabetically by path</entry>
 +                                      </row>
 +                                      <row>
 +                                              <entry><literal>unsorted</literal></entry>
 +                                              <entry>Do not resort the paths</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +      <sect2 id="sidebar-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># This is a complete list of sidebar-related configuration.
 + 
 +# --------------------------------------------------------------------------
 +# VARIABLES - shown with their default values
 +# --------------------------------------------------------------------------
 + 
 +# Should the Sidebar be shown?</emphasis>
 +set sidebar_visible = no
 + 
 +<emphasis role="comment"># How wide should the Sidebar be in screen columns?
 +# Note: Some characters, e.g. Chinese, take up two columns each.</emphasis>
 +set sidebar_width = 20
 + 
 +<emphasis role="comment"># Should the mailbox paths be abbreviated?</emphasis>
 +set sidebar_short_path = no
 + 
 +<emphasis role="comment"># When abbreviating mailbox path names, use any of these characters as path
 +# separators.  Only the part after the last separators will be shown.
 +# For file folders '/' is good.  For IMAP folders, often '.' is useful.</emphasis>
 +set sidebar_delim_chars = '/.'
 + 
 +<emphasis role="comment"># If the mailbox path is abbreviated, should it be indented?</emphasis>
 +set sidebar_folder_indent = no
 + 
 +<emphasis role="comment"># Indent mailbox paths with this string.</emphasis>
 +set sidebar_indent_string = '  '
 + 
 +<emphasis role="comment"># Make the Sidebar only display mailboxes that contain new, or flagged,
 +# mail.</emphasis>
 +set sidebar_new_mail_only = no
 + 
 +<emphasis role="comment"># Any mailboxes that are whitelisted will always be visible, even if the
 +# sidebar_new_mail_only option is enabled.</emphasis>
 +sidebar_whitelist '/home/user/mailbox1'
 +sidebar_whitelist '/home/user/mailbox2'
 + 
 +<emphasis role="comment"># When searching for mailboxes containing new mail, should the search wrap
 +# around when it reaches the end of the list?</emphasis>
 +set sidebar_next_new_wrap = no
 + 
 +<emphasis role="comment"># The character to use as the divider between the Sidebar and the other Mutt
 +# panels.
 +# Note: Only the first character of this string is used.</emphasis>
 +set sidebar_divider_char = '|'
 + 
 +<emphasis role="comment"># Display the Sidebar mailboxes using this format string.</emphasis>
 +set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'
 + 
 +<emphasis role="comment"># Sidebar will not refresh its list of mailboxes any more frequently than
 +# this number of seconds.  This will help reduce disk/network traffic.</emphasis>
 +set sidebar_refresh_time = 60
 + 
 +<emphasis role="comment"># Sort the mailboxes in the Sidebar using this method:
 +#       count    - total number of messages
 +#       flagged  - number of flagged messages
 +#       new      - number of new messages
 +#       path     - mailbox path
 +#       unsorted - do not sort the mailboxes</emphasis>
 +set sidebar_sort_method = 'unsorted'
 + 
 +<emphasis role="comment"># --------------------------------------------------------------------------
 +# FUNCTIONS - shown with an example mapping
 +# --------------------------------------------------------------------------
 + 
 +# Move the highlight to the previous mailbox</emphasis>
 +bind index,pager \Cp sidebar-prev
 + 
 +<emphasis role="comment"># Move the highlight to the next mailbox</emphasis>
 +bind index,pager \Cn sidebar-next
 + 
 +<emphasis role="comment"># Open the highlighted mailbox</emphasis>
 +bind index,pager \Co sidebar-open
 + 
 +<emphasis role="comment"># Move the highlight to the previous page
 +# This is useful if you have a LOT of mailboxes.</emphasis>
 +bind index,pager &lt;F3&gt; sidebar-page-up
 + 
 +<emphasis role="comment"># Move the highlight to the next page
 +# This is useful if you have a LOT of mailboxes.</emphasis>
 +bind index,pager &lt;F4&gt; sidebar-page-down
 + 
 +<emphasis role="comment"># Move the highlight to the previous mailbox containing new, or flagged,
 +# mail.</emphasis>
 +bind index,pager &lt;F5&gt; sidebar-prev-new
 + 
 +<emphasis role="comment"># Move the highlight to the next mailbox containing new, or flagged, mail.</emphasis>
 +bind index,pager &lt;F6&gt; sidebar-next-new
 + 
 +<emphasis role="comment"># Toggle the visibility of the Sidebar.</emphasis>
 +bind index,pager B sidebar-toggle-visible
 + 
 +<emphasis role="comment"># --------------------------------------------------------------------------
 +# COLORS - some unpleasant examples are given
 +# --------------------------------------------------------------------------
 +# Note: All color operations are of the form:
 +#       color OBJECT FOREGROUND BACKGROUND
 + 
 +# Color of the current, open, mailbox
 +# Note: This is a general Mutt option which colors all selected items.</emphasis>
 +color indicator cyan black
 + 
 +<emphasis role="comment"># Color of the highlighted, but not open, mailbox.</emphasis>
 +color sidebar_highlight black color8
 + 
 +<emphasis role="comment"># Color of the divider separating the Sidebar from Mutt panels</emphasis>
 +color sidebar_divider color8 black
 + 
 +<emphasis role="comment"># Color to give mailboxes containing flagged mail</emphasis>
 +color sidebar_flagged red black
 + 
 +<emphasis role="comment"># Color to give mailboxes containing new mail</emphasis>
 +color sidebar_new green black
 + 
 +<emphasis role="comment"># --------------------------------------------------------------------------
 + 
 +# vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="sidebar-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><link linkend="regexp">Regular Expressions</link></para></listitem>
 +                      <listitem><para><link linkend="patterns">Patterns</link></para></listitem>
 +                      <listitem><para><link linkend="color">Color command</link></para></listitem>
 +                      <listitem><para><link linkend="notmuch">notmuch patch</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="sidebar-known-bugs">
 +              <title>Known Bugs</title>
 +              Unsorted isn't
 +      </sect2>
 +
 +      <sect2 id="sidebar-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Justin Hibbits <email>jrh29@po.cwru.edu</email></para></listitem>
 +              <listitem><para>Thomer M. Gil <email>mutt@thomer.com</email></para></listitem>
 +              <listitem><para>David Sterba <email>dsterba@suse.cz</email></para></listitem>
 +              <listitem><para>Evgeni Golov <email>evgeni@debian.org</email></para></listitem>
 +              <listitem><para>Fabian Groffen <email>grobian@gentoo.org</email></para></listitem>
 +              <listitem><para>Jason DeTiberus <email>jdetiber@redhat.com</email></para></listitem>
 +              <listitem><para>Stefan Assmann <email>sassmann@kpanic.de</email></para></listitem>
 +              <listitem><para>Steve Kemp <email>steve@steve.org.uk</email></para></listitem>
 +              <listitem><para>Terry Chan <email>tchan@lunar-linux.org</email></para></listitem>
 +              <listitem><para>Tyler Earnest <email>tylere@rne.st</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="ifdef">
 +      <title>Ifdef Patch</title>
 +      <subtitle>Conditional config options</subtitle>
 +
 +      <sect2 id="ifdef-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>ifdef</quote>, look for
 +                      <quote>patch-ifdef</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="ifdef-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +                      The <quote>ifdef</quote> patch introduces three new commands to
 +                      Mutt and allow you to share one config file between versions of Mutt
 +                      that may have different features compiled in.
 +              </para>
 +
 +<screen>
 +ifdef  symbol config-command [args...]  <emphasis role="comment"># If a symbol is defined</emphasis>
 +ifndef symbol config-command [args...]  <emphasis role="comment"># If a symbol is not defined</emphasis>
 +finish                                  <emphasis role="comment"># Finish reading the current file</emphasis>
 +</screen>
 +
 +              <para>
 +                      Here a symbol can be a <link linkend="variables">$variable</link>,
 +                      <link linkend="functions">&lt;function&gt;</link>,
 +                      <link linkend="commands">command</link> or compile-time symbol, such
 +                      as <quote>USE_IMAP</quote>.
 +              </para>
 +
 +        <para>
 +            <literal>finish</literal> is particularly useful when combined with
 +            <literal>ifndef</literal>. e.g.
 +        </para>
 +
 +<screen>
 +<emphasis role="comment"># Sidebar config file</emphasis>
 +ifndef USE_SIDEBAR finish
 +</screen>
 +
 +      </sect2>
 +
 +<!--
 +      <sect2 id="ifdef-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="ifdef-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="ifdef-commands">
 +              <title>Commands</title>
 +              <cmdsynopsis>
 +                      <command>ifdef</command>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">symbol</replaceable>
 +                      </arg>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">"config-command [args]"</replaceable>
 +                      </arg>
 +                      <command>ifndef</command>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">symbol</replaceable>
 +                      </arg>
 +                      <arg choice="plain">
 +                              <replaceable class="parameter">"config-command [args]"</replaceable>
 +                      </arg>
 +                      <command>finish</command>
 +              </cmdsynopsis>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="ifdef-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="ifdef-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="ifdef-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'ifdef' feature.
 + 
 +# This feature introduces three useful commands which allow you to share
 +# one config file between versions of Mutt that may have different
 +# features compiled in.
 + 
 +#     ifdef  symbol config-command [args...]
 +#     ifndef symbol config-command [args...]
 +#     finish                                
 + 
 +# The 'ifdef' command tests whether Mutt understands the name of
 +# a variable, function, command or compile-time symbol.
 +# If it does, then it executes a config command.
 + 
 +# The 'ifndef' command tests whether a symbol does NOT exist.
 + 
 +# The 'finish' command tells Mutt to stop reading current config file.
 + 
 +# If the 'trash' variable exists, set it.</emphasis>
 +ifdef trash 'set trash=~/Mail/trash'
 + 
 +<emphasis role="comment"># If the 'tag-pattern' function exists, bind a key to it.</emphasis>
 +ifdef tag-pattern 'bind index &lt;F6&gt; tag-pattern'
 + 
 +<emphasis role="comment"># If the 'imap-fetch-mail' command exists, read my IMAP config.</emphasis>
 +ifdef imap-fetch-mail 'source ~/.mutt/imap.rc'
 + 
 +<emphasis role="comment"># If the compile-time symbol 'USE_SIDEBAR' does not exist, then
 +# stop reading the current config file.</emphasis>
 +ifndef USE_SIDEBAR finish
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="ifdef-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="ifdef-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="ifdef-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Cedric Duval <email>cedricduval@free.fr</email></para></listitem>
 +              <listitem><para>Matteo F. Vescovi <email>mfvescovi@gmail.com</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="fmemopen">
 +      <title>Fmemopen Patch</title>
 +      <subtitle>Replace some temporary files with memory buffers</subtitle>
 +
 +      <sect2 id="fmemopen-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>fmemopen</quote>, look for
 +                      <quote>patch-fmemopen</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +                      <listitem><para><literal>open_memstream()</literal>, <literal>fmemopen()</literal> from glibc</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-intro">
 +              <title>Introduction</title>
 +
 +        <para>
 +              The <quote>fmemopen</quote> patch speeds up some searches.
 +        </para>
 +
 +        <para>
 +              This patch changes a few places where Mutt creates temporary files.
 +              It replaces them with in-memory buffers.  This should improve the
 +              performance when searching the header or body using the
 +              <link linkend="thorough-search">$thorough_search</link> option.
 +        </para>
 +
 +        <para>
 +              There are no user-configurable parts.
 +        </para>
 +
 +        <para>
 +              This patch depends on <literal>open_memstream()</literal> and
 +              <literal>fmemopen()</literal>.  They are provided by glibc.  Without
 +              them, Mutt will simply create temporary files.
 +        </para>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="fmemopen-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="fmemopen-muttrc">
 +              <title>Muttrc</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="compile-time-features">Compile-Time Features</link></para></listitem>
 +                      <listitem><para><literal>fmemopen(3)</literal></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="fmemopen-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Julius Plenz <email>plenz@cis.fu-berlin.de</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="initials">
 +      <title>Initials Expando Patch</title>
 +      <subtitle>Expando for author's initials</subtitle>
 +
 +      <sect2 id="initials-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Initials</quote>, look for
 +                      <quote>patch-initials</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="initials-intro">
 +              <title>Introduction</title>
 +
 +        <para>
 +              The <quote>initials</quote> patch adds an expando (%I) for an author's
 +              initials.
 +        </para>
 +
 +              <para>
 +              The index panel displays a list of emails.  Its layout is controlled by
 +              the <link linkend="index-format">$index_format</link> variable.  Using
 +              this expando saves space in the index panel.  This can be useful if you
 +              are regularly working with a small set of people.
 +              </para>
 +      </sect2>
 +
 +      <sect2 id="initials-variables">
 +              <title>Variables</title>
 +
 +        <para>
 +        This patch has no config of its own.  It adds an expando which can be
 +              used in the <link linkend="index-format">$index_format</link> variable.
 +        </para>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="initials-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="initials-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="initials-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="initials-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="initials-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'initials' patch.
 + 
 +# The 'initials' patch has no config of its own.
 +# It adds an expando for an author's initials,
 +# which can be used in the 'index_format' variable.
 + 
 +# The default 'index_format' is:</emphasis>
 +set index_format='%4C %Z %{%b %d} %-15.15L (%?l?%4l&amp;%4c?) %s'
 + 
 +<emphasis role="comment"># Where %L represents the author/recipient
 + 
 +# This might look like:
 +#       1   + Nov 17 David Bowie   Changesbowie    ( 689)
 +#       2   ! Nov 17 Stevie Nicks  Rumours         ( 555)
 +#       3   + Nov 16 Jimi Hendrix  Voodoo Child    ( 263)
 +#       4   + Nov 16 Debbie Harry  Parallel Lines  ( 540)
 + 
 +# Using the %I expando:</emphasis>
 +set index_format='%4C %Z %{%b %d} %I (%?l?%4l&amp;%4c?) %s'
 + 
 +<emphasis role="comment"># This might look like:
 +#       1   + Nov 17 DB Changesbowie    ( 689)
 +#       2   ! Nov 17 SN Rumours         ( 555)
 +#       3   + Nov 16 JH Voodoo Child    ( 263)
 +#       4   + Nov 16 DH Parallel Lines  ( 540)
 + 
 +# vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="initials-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="index-format">$index_format</link></para></listitem>
 +                      <listitem><para><link linkend="index-color">index-color patch</link></para></listitem>
 +                      <listitem><para><link linkend="folder-hook">folder-hook</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="initials-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="initials-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Vsevolod Volkov <email>vvv@mutt.org.ua</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="trash-folder">
 +      <title>Trash Folder Patch</title>
 +      <subtitle>Automatically move "deleted" emails to a trash bin</subtitle>
 +
 +      <sect2 id="trash-folder-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>Trash Folder</quote>, look for
 +                      <quote>patch-trash</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              If IMAP is enabled, this patch will use it
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +                      <listitem><para>IMAP support</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +              In Mutt, when you <quote>delete</quote> an email it is first marked
 +              deleted.  The email isn't really gone until
 +              <link linkend="index-map">&lt;sync-mailbox&gt;</link> is called.
 +              This happens when the user leaves the folder, or the function is called
 +              manually.
 +              </para>
 +
 +              <para>
 +              After <literal>&lt;sync-mailbox&gt;</literal> has been called the email is gone forever.
 +              </para>
 +
 +              <para>
 +              The <link linkend="trash">$trash</link> variable defines a folder in
 +              which to keep old emails.  As before, first you mark emails for
 +              deletion.  When &lt;sync-mailbox&gt; is called the emails are moved to
 +              the trash folder.
 +              </para>
 +
 +              <para>
 +              The <literal>$trash</literal> path can be either a full directory,
 +              or be relative to the <link linkend="folder">$folder</link>
 +              variable, like the <literal>mailboxes</literal> command.
 +              </para>
 +
 +              <note>
 +              Emails deleted from the trash folder are gone forever.
 +              </note>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-variables">
 +              <title>Variables</title>
 +              <table id="table-trash-variables">
 +                      <title>Trash Variables</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Name</entry>
 +                                              <entry>Type</entry>
 +                                              <entry>Default</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>trash</entry>
 +                                              <entry>string</entry>
 +                                              <entry>(none)</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-functions">
 +              <title>Functions</title>
 +              <table id="table-trash-functions">
 +                      <title>Trash Functions</title>
 +                      <tgroup cols="4">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Menus</entry>
 +                                              <entry>Default Key</entry>
 +                                              <entry>Function</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>index,pager</entry>
 +                                              <entry>(none)</entry>
 +                                              <entry><literal>&lt;purge-message&gt;</literal></entry>
 +                                              <entry>really delete the current entry, bypassing the trash folder</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="trash-folder-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="trash-folder-muttrc">
 +              <title>Muttrc</title>
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'trash' feature.
 + 
 +# This feature defines a new 'trash' folder.
 +# When mail is deleted it will be moved to this folder.
 + 
 +# Folder in which to put deleted emails</emphasis>
 +set trash='+Trash'
 +set trash='/home/flatcap/Mail/Trash'
 + 
 +<emphasis role="comment"># The default delete key 'd' will move an email to the 'trash' folder
 +# Bind 'D' to REALLY delete an email</emphasis>
 +bind index D purge-message
 + 
 +<emphasis role="comment"># Note: Deleting emails from the 'trash' folder will REALLY delete them.
 + 
 +# vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +                      <listitem><para><link linkend="folder-hook">folder-hook</link></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="trash-folder-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>Cedric Duval <email>cedricduval@free.fr</email></para></listitem>
 +              <listitem><para>Benjamin Kuperman <email>kuperman@acm.org</email></para></listitem>
 +              <listitem><para>Paul Miller <email>paul@voltar.org</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="limit-current-thread">
 +      <title>Limit-Current-Thread Patch</title>
 +      <subtitle>Focus on one Email Thread</subtitle>
 +
 +      <sect2 id="limit-current-thread-patch">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>limit-current-thread</quote>, look for
 +                      <quote>patch-limit-current-thread</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="limit-current-thread-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +                      This patch adds a new way of using the
 +                      <link linkend="tuning-search">Limit Command</link>.
 +                        The <literal>&lt;limit-current-thread&gt;</literal>
 +                        function restricts the view to just the current thread.
 +                        Setting the limit (the <literal>l</literal> key) to
 +                        <quote>all</quote> will restore the full email list.
 +              </para>
 +
 +      </sect2>
 +
 +<!--
 +      <sect2 id="limit-current-thread-variables">
 +              <title>Variables</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +      <sect2 id="limit-current-thread-functions">
 +              <title>Functions</title>
 +
 +              <table id="table-limit-current-thread-functions">
 +                      <title>Limit-Current-Thread Functions</title>
 +                      <tgroup cols="4">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Menus</entry>
 +                                              <entry>Default Key</entry>
 +                                              <entry>Function</entry>
 +                                              <entry>Description</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry>index</entry>
 +                                                <entry><literal>&lt;Esc&gt; L</literal></entry>
 +                                              <entry><literal>&lt;limit-current-thread&gt;</literal></entry>
 +                                              <entry>Limit view to current thread</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +
 +      </sect2>
 +<!--
 +      <sect2 id="limit-current-thread-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="limit-current-thread-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="limit-current-thread-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="limit-current-thread-muttrc">
 +              <title>Muttrc</title>
 +
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'limit-current-thread' patch.
 + 
 +# Limit view to current thread</emphasis>
 +bind index &lt;esc&gt;L limit-current-thread
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="limit-current-thread-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="limit-current-thread-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="limit-current-thread-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>David Sterba <email>dsterba@suse.cz</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
 +<sect1 id="skip-quoted-patch">
 +      <title>Skip-Quoted Patch</title>
 +      <subtitle>Leave some context visible</subtitle>
 +
 +      <sect2 id="skip-quoted-patch2">
 +              <title>Patch</title>
 +
 +              <para>
 +                      To check if Mutt supports <quote>skip-quoted</quote>, look for
 +                      <quote>patch-skip-quoted</quote> in the mutt version.
 +                      See: <xref linkend="mutt-patches"/>.
 +              </para>
 +
 +              <itemizedlist>
 +                      <title>Dependencies:</title>
 +                      <listitem><para>mutt-1.6.1</para></listitem>
 +              </itemizedlist>
 +
 +              <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-intro">
 +              <title>Introduction</title>
 +
 +              <para>
 +                      When viewing an email, the
 +                      <literal>&lt;skip-to-quoted&gt;</literal> function (by default the
 +                      <literal>S</literal> key) will scroll past any quoted text.
 +                      Sometimes, a little context is useful.
 +              </para>
 +
 +              <para>
 +                      By setting the <literal>$skip_quoted_offset</literal> variable, you
 +                      can select how much of the quoted text is left visible.
 +              </para>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-variables">
 +              <title>Variables</title>
 +              <table id="table-skip-quoted-variables">
 +                      <title>Skip-Quoted Variables</title>
 +                      <tgroup cols="3">
 +                              <thead>
 +                                      <row>
 +                                              <entry>Name</entry>
 +                                              <entry>Type</entry>
 +                                              <entry>Default</entry>
 +                                      </row>
 +                              </thead>
 +                              <tbody>
 +                                      <row>
 +                                              <entry><literal>skip_quoted_offset</literal></entry>
 +                                              <entry>number</entry>
 +                                              <entry>0</entry>
 +                                      </row>
 +                              </tbody>
 +                      </tgroup>
 +              </table>
 +      </sect2>
 +
 +<!--
 +      <sect2 id="skip-quoted-functions">
 +              <title>Functions</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-commands">
 +              <title>Commands</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-colors">
 +              <title>Colors</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-sort">
 +              <title>Sort</title>
 +              <para>None</para>
 +      </sect2>
 +-->
 +
 +      <sect2 id="skip-quoted-muttrc">
 +              <title>Muttrc</title>
 +
 +<screen>
 +<emphasis role="comment"># Example Mutt config file for the 'skip-quoted' patch.
 + 
 +# The 'S' (skip-quoted) command scrolls the pager past the quoted text (usually
 +# indented with '&gt; '.  Setting 'skip_quoted_offset' leaves some lines of quoted
 +# text on screen for context.
 + 
 +# Show three quoted lines before the reply</emphasis>
 +set skip_quoted_offset = 3
 + 
 +<emphasis role="comment"># vim: syntax=muttrc</emphasis>
 +</screen>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-see-also">
 +              <title>See Also</title>
 +
 +              <itemizedlist>
 +                      <listitem><para><ulink url="http://www.neomutt.org/">NeoMutt Project</ulink></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-known-bugs">
 +              <title>Known Bugs</title>
 +              <para>None</para>
 +      </sect2>
 +
 +      <sect2 id="skip-quoted-credits">
 +              <title>Credits</title>
 +              <itemizedlist>
 +              <listitem><para>David Sterba <email>dsterba@suse.cz</email></para></listitem>
 +              <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
 +              </itemizedlist>
 +      </sect2>
 +</sect1>
 +
++<sect1 id="compress">
++      <title>Compressed Folders Patch</title>
++      <subtitle>Read from/write to compressed mailboxes</subtitle>
++
++      <sect2 id="compress-patch">
++              <title>Patch</title>
++
++              <para>
++                      To check if Mutt supports <quote>Compress Folders</quote>, look for
++                      <quote>+USE_COMPRESSED</quote> in the mutt version.
++                      See: <xref linkend="compile-time-features"/>.
++              </para>
++
++              <itemizedlist>
++                      <title>Dependencies:</title>
++                      <listitem><para>mutt-1.5.24</para></listitem>
++              </itemizedlist>
++
++              <para>This patch is part of the <ulink url="https://github.com/neomutt/neomutt/wiki">NeoMutt Project</ulink>.</para>
++      </sect2>
++
++      <sect2 id="compress-intro">
++              <title>Introduction</title>
++
++              <para>
++                      The Compressed Folder patch allows Mutt to read mailbox files that are
++                      compressed.  But it isn't limited to compressed files.  It works well
++                      with encrypted files, too.  In fact, if you can create a program/script
++                      to convert to and from your format, then Mutt can read it.
++              </para>
++
++              <para>
++                      The patch adds three hooks to Mutt: <literal>open-hook</literal>,
++                      <literal>close-hook</literal> and <literal>append-hook</literal>.  They
++                      define commands to: uncompress a file; compress a file; append
++                      messages to an already compressed file.
++              </para>
++
++              <para>
++                      There are some examples of both compressed and encrypted files,
++                      later.  For now, the documentation will just concentrate on
++                      compressed files.
++              </para>
++
++      </sect2>
++
++<!--
++      <sect2 id="compress-variables">
++              <title>Variables</title>
++              <para>None</para>
++      </sect2>
++
++      <sect2 id="compress-functions">
++              <title>Functions</title>
++              <para>None</para>
++      </sect2>
++-->
++
++      <sect2 id="compress-commands">
++              <title>Commands</title>
++              <cmdsynopsis>
++                      <command>open-hook</command>
++                      <arg choice="plain">
++                              <replaceable class="parameter">pattern</replaceable>
++                      </arg>
++                      <arg choice="plain">
++                              <replaceable class="parameter">shell-command</replaceable>
++                      </arg>
++                      <command>close-hook</command>
++                      <arg choice="plain">
++                              <replaceable class="parameter">pattern</replaceable>
++                      </arg>
+                       <arg choice="plain">
+                               <replaceable class="parameter">shell-command</replaceable>
+                       </arg>
+                       <command>append-hook</command>
+                       <arg choice="plain">
+                               <replaceable class="parameter">pattern</replaceable>
+                       </arg>
+                       <arg choice="plain">
+                               <replaceable class="parameter">shell-command</replaceable>
+                       </arg>
+               </cmdsynopsis>
+               <para>
+                       The shell-command must contain two placeholders for filenames:
+                       <literal>%f</literal> and <literal>%t</literal>.  These represent
+                       <quote>from</quote> and <quote>to</quote> filenames.  It's a good idea to
+                       put quotes around these placeholders.
+               </para>
+               <para>
+                       If you need the exact string <quote>%f</quote> or <quote>%t</quote> in your
+                       command, simply double up the <quote>%</quote> character, e.g.
+                       <quote>%%f</quote> or <quote>%%t</quote>.
+               </para>
+               <table id="table-compress-optional">
+                       <title>Not all Hooks are Required</title>
+                       <tgroup cols="5">
+                               <thead>
+                                       <row>
+                                               <entry>Open</entry>
+                                               <entry>Close</entry>
+                                               <entry>Append</entry>
+                                               <entry>Effect</entry>
+                                               <entry>Useful if</entry>
+                                       </row>
+                               </thead>
+                               <tbody>
+                                       <row>
+                                               <entry>Open</entry>
+                                               <entry>-</entry>
+                                               <entry>-</entry>
+                                               <entry>Folder is readonly</entry>
+                                               <entry>The folder is just a backup</entry>
+                                       </row>
+                                       <row>
+                                               <entry>Open</entry>
+                                               <entry>Close</entry>
+                                               <entry>-</entry>
+                                               <entry>Folder is read/write, but the entire folder must be
+                                                       written if anything is changed</entry>
+                                               <entry>Your compression format doesn't support appending</entry>
+                                       </row>
+                                       <row>
+                                               <entry>Open</entry>
+                                               <entry>Close</entry>
+                                               <entry>Append</entry>
+                                               <entry>Folder is read/write and emails can be efficiently added
+                                                       to the end</entry>
+                                               <entry>Your compression format supports appending</entry>
+                                       </row>
+                                       <row>
+                                               <entry>Open</entry>
+                                               <entry>-</entry>
+                                               <entry>Append</entry>
+                                               <entry>Folder is readonly, but can be appended to</entry>
+                                               <entry>You want to store emails, but never change them</entry>
+                                       </row>
+                               </tbody>
+                       </tgroup>
+               </table>
+               <note>
+                       The command:
+                       <itemizedlist>
+                               <listitem><para>should return a non-zero exit status on failure</para></listitem>
+                               <listitem><para>should not delete any files</para></listitem>
+                       </itemizedlist>
+               </note>
+               <sect3 id="open-hook">
+                       <title>Read from compressed mailbox</title>
+                       <screen>open-hook regexp shell-command</screen>
+                       <para>
+                               If Mutt is unable to open a file, it then looks for
+                               <literal>open-hook</literal> that matches the filename.
+                       </para>
+                       <para>
+                               If your compression program doesn't have a well-defined extension,
+                               then you can use <literal>.</literal> as the regexp.
+                       </para>
+                       <sect4 id="compress-open-hook-example">
+                               <title>Example of open-hook</title>
+                               <screen>open-hook '\.gz$' &quot;gzip -cd '%f' &gt; '%t'&quot;</screen>
+                               <itemizedlist>
+                                       <listitem><para>Mutt finds a file, <quote>example.gz</quote>,
+                                                       that it can't read</para></listitem>
+                                       <listitem><para>Mutt has an <literal>open-hook</literal>
+                                                       whose regexp matches the filename:
+                                                       <literal>\.gz$</literal></para></listitem>
+                                       <listitem><para>Mutt uses the command <literal>gzip -cd</literal>
+                                                       to create a temporary file that it <emphasis>can</emphasis>
+                                                       read</para></listitem>
+                               </itemizedlist>
+                       </sect4>
+               </sect3>
+               <sect3 id="close-hook">
+                       <title>Write to a compressed mailbox</title>
+                       <screen>close-hook regexp shell-command</screen>
+                       <para>
+                               When Mutt has finished with a compressed mail folder, it will look
+                               for a matching <literal>close-hook</literal> to recompress the file.
+                               This hook is <link linkend="table-compress-optional">optional</link>.
+                       </para>
+                       <note>
+                               If the folder has not been modifed, the
+                               <literal>close-hook</literal> will not be called.
+                       </note>
+                       <sect4 id="compress-close-hook-example">
+                               <title>Example of close-hook</title>
+                               <screen>close-hook '\.gz$' &quot;gzip -c '%t' &gt; '%f'&quot;</screen>
+                               <itemizedlist>
+                                       <listitem><para>Mutt has finished with a folder, <quote>example.gz</quote>,
+                                                       that it opened with <literal>open-hook</literal></para></listitem>
+                                       <listitem><para>The folder has been modified</para></listitem>
+                                       <listitem><para>Mutt has a <literal>close-hook</literal> whose regexp
+                                                       matches the filename: <literal>\.gz$</literal></para></listitem>
+                                       <listitem><para>Mutt uses the command <literal>gzip -c</literal>
+                                                       to create a new compressed file</para></listitem>
+                               </itemizedlist>
+                       </sect4>
+               </sect3>
+               <sect3 id="append-hook">
+                       <title>Append to a compressed mailbox</title>
+                       <screen>append-hook regexp shell-command</screen>
+                       <para>
+                               When Mutt wants to append an email to a compressed mail folder, it
+                               will look for a matching <literal>append-hook</literal>.
+                               This hook is <link linkend="table-compress-optional">optional</link>.
+                       </para>
+                       <para>
+                               Using the <literal>append-hook</literal> will save time, but
+                               Mutt won't be able to determine the type of the mail folder
+                               inside the compressed file.
+                       </para>
+                       <para>
+                               Mutt will <emphasis>assume</emphasis> the type to be that of
+                               the <literal>$mbox_type</literal> variable.  Mutt also uses
+                               this type for temporary files.
+                       </para>
+                       <para>
+                               Mutt will only use the <literal>append-hook</literal> for existing files.
+                               The <literal>close-hook</literal> will be used for empty, or missing files.
+                       </para>
+                       <sect4 id="compress-append-hook-example">
+                               <title>Example of append-hook</title>
+                               <screen>append-hook '\.gz$' &quot;gzip -c '%t' &gt;&gt; '%f'&quot;</screen>
+                               <itemizedlist>
+                                       <listitem><para>Mutt wants to append an email to a folder, <quote>example.gz</quote>,
+                                                       that it opened with <literal>open-hook</literal></para></listitem>
+                                       <listitem><para>Mutt has an <literal>append-hook</literal> whose regexp matches
+                                                       the filename: <literal>\.gz$</literal></para></listitem>
+                                       <listitem><para>Mutt knows the mailbox type from the <literal>$mbox</literal>
+                                                       variable</para></listitem>
+                                       <listitem><para>Mutt uses the command <literal>gzip -c</literal>
+                                                       to append to an existing compressed file</para></listitem>
+                               </itemizedlist>
+                       </sect4>
+               </sect3>
+               <sect3 id="compress-empty">
+                       <title>Empty Files</title>
+                       <para>
+                               Mutt assumes that an empty file is not compressed.  In this
+                               situation, unset <link linkend="save-empty">$save_empty</link>, so
+                               that the compressed file will be removed if you delete all of the
+                               messages.
+                       </para>
+               </sect3>
+               <sect3 id="compress-security">
+                       <title>Security</title>
+                       <para>
+                               Encrypted files are decrypted into temporary files which are
+                               stored in the <link linkend="tmpdir">$tmpdir</link> directory.
+                               This could be a security risk.
+                       </para>
+               </sect3>
+       </sect2>
+ <!--
+       <sect2 id="compress-colors">
+               <title>Colors</title>
+               <para>None</para>
+       </sect2>
+       <sect2 id="compress-sort">
+               <title>Sort</title>
+               <para>None</para>
+       </sect2>
+ -->
+       <sect2 id="compress-muttrc">
+               <title>Muttrc</title>
+ <screen>
+ <emphasis role="comment"># Example Mutt config file for the 'compressed folders' feature.
+  
+ # This feature adds three hooks to Mutt which allow it to
+ # work with compressed, or encrypted, mailboxes.
+  
+ # The hooks are of the form:
+ #       open-hook   regexp &quot;shell-command&quot;
+ #       close-hook  regexp &quot;shell-command&quot;
+ #       append-hook regexp &quot;shell-command&quot;
+  
+ # The 'append-hook' is optional.
+  
+ # Hander for gzip compressed mailboxes</emphasis>
+ open-hook   '\.gz$'  &quot;gzip -cd  '%f' &gt;  '%t'&quot;
+ close-hook  '\.gz$'  &quot;gzip -c   '%t' &gt;  '%f'&quot;
+ append-hook '\.gz$'  &quot;gzip -c   '%t' &gt;&gt; '%f'&quot;
+  
+ <emphasis role="comment"># Hander for bzip2 compressed mailboxes</emphasis>
+ open-hook   '\.bz2$' &quot;bzip2 -cd '%f' &gt;  '%t'&quot;
+ close-hook  '\.bz2$' &quot;bzip2 -c  '%t' &gt;  '%f'&quot;
+ append-hook '\.bz2$' &quot;bzip2 -c  '%t' &gt;&gt; '%f'&quot;
+  
+ <emphasis role="comment"># Hander for xz compressed mailboxes</emphasis>
+ open-hook   '\.xz$'  &quot;xz    -cd '%f' &gt;  '%t'&quot;
+ close-hook  '\.xz$'  &quot;xz    -c  '%t' &gt;  '%f'&quot;
+ append-hook '\.xz$'  &quot;xz    -c  '%t' &gt;&gt; '%f'&quot;
+  
+ <emphasis role="comment"># Hander for pgp encrypted mailboxes
+ # PGP does not support appending to an encrypted file</emphasis>
+ open-hook   '\.pgp$' &quot;pgp -f &lt; '%f' &gt; '%t'&quot;
+ close-hook  '\.pgp$' &quot;pgp -fe YourPgpUserIdOrKeyId &lt; '%t' &gt; '%f'&quot;
+  
+ <emphasis role="comment"># Hander for gpg encrypted mailboxes
+ # gpg does not support appending to an encrypted file</emphasis>
+ open-hook   '\.gpg$' &quot;gpg --decrypt &lt; '%f' &gt; '%t'&quot;
+ close-hook  '\.gpg$' &quot;gpg --encrypt --recipient YourGpgUserIdOrKeyId &lt; '%t' &gt; '%f'&quot;
+  
+ <emphasis role="comment"># vim: syntax=muttrc</emphasis>
+ </screen>
+       </sect2>
+       <sect2 id="compress-see-also">
+               <title>See Also</title>
+               <itemizedlist>
+                       <listitem><para><ulink url="https://github.com/neomutt/neomutt/wiki">NeoMutt Project</ulink></para></listitem>
+                       <listitem><para><link linkend="compile-time-features">Compile-Time Features</link></para></listitem>
+                       <listitem><para><link linkend="regexp">Regular Expressions</link></para></listitem>
+                       <listitem><para><link linkend="tmpdir">$tmpdir</link></para></listitem>
+                       <listitem><para><link linkend="mbox-type">$mbox_type</link></para></listitem>
+                       <listitem><para><link linkend="save-empty">$save_empty</link></para></listitem>
+                       <listitem><para><link linkend="folder-hook">folder-hook</link></para></listitem>
+               </itemizedlist>
+       </sect2>
+       <sect2 id="compress-known-bugs">
+               <title>Known Bugs</title>
+               <itemizedlist>
+                       <listitem><para>The Compressed Folder hooks cannot deal with filenames that contains quotes/apostrophes.</para></listitem>
+               </itemizedlist>
+       </sect2>
+       <sect2 id="compress-credits">
+               <title>Credits</title>
+               <itemizedlist>
+               <listitem><para>Roland Rosenfeld <email>roland@spinnaker.de</email></para></listitem>
+               <listitem><para>Alain Penders <email>Alain@Finale-Dev.com</email></para></listitem>
+               <listitem><para>Christoph <quote>Myon</quote> Berg <email>myon@debian.org</email></para></listitem>
+               <listitem><para>Evgeni Golov <email>evgeni@debian.org</email></para></listitem>
+               <listitem><para>Richard Russon <email>rich@flatcap.org</email></para></listitem>
+               </itemizedlist>
+       </sect2>
+ </sect1>
  </chapter>
  
  <chapter id="security">
diff --cc hook.c
Simple merge
diff --cc init.h
Simple merge
diff --cc mbox.c
Simple merge
diff --cc mutt.h
Simple merge
diff --cc mx.c
index 3e35705f5169024d6eb49d5a5dd5e3dbb3fac249,7f3e8e11004c40bd5ec506252ba67aabc5056917..9a76313f3584c62f3e5db39bcb63e71c42ec0eb3
--- 1/mx.c
--- 2/mx.c
+++ b/mx.c
  #include "copy.h"
  #include "keymap.h"
  #include "url.h"
 +#ifdef USE_SIDEBAR
 +#include "sidebar.h"
 +#endif
  
+ #ifdef USE_COMPRESSED
+ #include "compress.h"
+ #endif
  #ifdef USE_IMAP
  #include "imap.h"
  #endif
@@@ -777,12 -739,12 +797,16 @@@ void mx_fastclose_mailbox (CONTEXT *ctx
    mutt_clear_threads (ctx);
    for (i = 0; i < ctx->msgcount; i++)
      mutt_free_header (&ctx->hdrs[i]);
 +#ifdef USE_SIDEBAR
 +  ctx->msgcount -= ctx->deleted;
 +  sb_set_buffystats (ctx);
 +#endif
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);
+ #ifdef USE_COMPRESSED
+   if (ctx->compress_info)
+     comp_fast_close (ctx);
+ #endif
    FREE (&ctx->path);
    FREE (&ctx->pattern);
    if (ctx->limit_pattern) 
diff --cc mx.h
index 18fc84534f0cae7363ad50a2544727ce59a20360,d926cf68e20e506a8417196fcf22302b13213a4c..2920dc2fd66d84d9eb7ef8009482f35230db6067
--- 1/mx.h
--- 2/mx.h
+++ b/mx.h
@@@ -36,8 -35,10 +36,11 @@@ enu
    M_MH,
    M_MAILDIR,
    M_IMAP,
 +  M_NOTMUCH,
    M_POP
+ #ifdef USE_COMPRESSED
+   , M_COMPRESSED
+ #endif
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);
diff --cc status.c
index c458516e68132ac479b8baaccb68b3f7ed2e2f13,2573b8d3255aa9dd5fee0ff3f37594e79635edc1..101fa814d1e7a3cc3f81143b71e76e0ab5687880
+++ b/status.c
@@@ -99,13 -95,12 +99,19 @@@ status_format_str (char *buf, size_t bu
        break;
  
      case 'f':
 -      snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
 +    {
 +#ifdef USE_NOTMUCH
 +      char *p;
 +      if (Context && Context->magic == M_NOTMUCH &&
 +                   (p = nm_get_description(Context)))
 +        strfcpy(tmp, p, sizeof (tmp));
 +      else
++#endif
+ #ifdef USE_COMPRESSED
+       if (Context && Context->compress_info && Context->realpath) {
+        strfcpy (tmp, Context->realpath, sizeof (tmp));
+        mutt_pretty_mailbox (tmp, sizeof (tmp));
+       } else
  #endif
        if (Context && Context->path)
        {
diff --cc version.c
index f21f0a7bd31087823bc955fb1e7f23c43e7e0e31,0000000000000000000000000000000000000000..c6cdce3fdfb09f4c7b1a420ab17680c99dceab90
mode 100644,000000..100644
--- /dev/null
+++ b/version.c
@@@ -1,506 -1,0 +1,511 @@@
 +/**
 + * Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>
 + * Copyright (C) 1999-2007 Thomas Roessler <roessler@does-not-exist.org>
 + * Copyright (C) 2016 Richard Russon
 + *
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 2 of the License, or
 + * (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 + */
 +
 +#if HAVE_CONFIG_H
 +#include "config.h"
 +#endif
 +
 +#include <stdio.h>
 +#include <string.h>
 +#include <sys/utsname.h>
 +
 +#ifdef HAVE_STRINGPREP_H
 +#include <stringprep.h>
 +#elif defined (HAVE_IDN_STRINGPREP_H)
 +#include <idn/stringprep.h>
 +#endif
 +#ifdef USE_SLANG_CURSES
 +#include "slang.h"
 +#endif
 +
 +#include "lib.h"
 +
 +// #include "protos.h"
 +const char * mutt_make_version (void);
 +void mutt_print_patchlist (void);
 +
 +// #include "hcache.h"
 +const char * mutt_hcache_backend (void);
 +
 +const int SCREEN_WIDTH = 80;
 +
 +extern const char cc_version[];
 +extern const char cc_cflags[];
 +extern const char configure_options[];
 +
 +static const char *Copyright = N_(
 +      "Copyright (C) 1996-2014 Michael R. Elkins <me@mutt.org>\n"
 +      "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
 +      "Copyright (C) 1997-2009 Thomas Roessler <roessler@does-not-exist.org>\n"
 +      "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
 +      "Copyright (C) 1999-2014 Brendan Cully <brendan@kublai.com>\n"
 +      "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 +      "Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo@rano.org>\n"
 +      "Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
 +      "Copyright (C) 2014-2015 Kevin J. McCarthy <kevin@8t8.us>\n"
 +      "\n"
 +      "Many others not mentioned here contributed code, fixes,\n"
 +      "and suggestions.\n"
 +);
 +
 +static const char *License = N_(
 +      "    This program is free software; you can redistribute it and/or modify\n"
 +      "    it under the terms of the GNU General Public License as published by\n"
 +      "    the Free Software Foundation; either version 2 of the License, or\n"
 +      "    (at your option) any later version.\n"
 +      "\n"
 +      "    This program is distributed in the hope that it will be useful,\n"
 +      "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 +      "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 +      "    GNU General Public License for more details.\n"
 +);
 +
 +static const char *Obtaining = N_(
 +      "    You should have received a copy of the GNU General Public License\n"
 +      "    along with this program; if not, write to the Free Software\n"
 +      "    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
 +);
 +
 +static const char *ReachingUs = N_(
 +      "To learn more about NeoMutt, visit: http://www.neomutt.org/\n"
 +      "If you find a bug in NeoMutt, please raise an issue at:\n"
 +      "    https://github.com/neomutt/neomutt/issues\n"
 +      "or contact the lead developer: Richard Russon <rich@flatcap.org>\n"
 +);
 +
 +static const char *Notice = N_(
 +      "Copyright (C) 1996-2016 Michael R. Elkins and others.\n"
 +      "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 +      "Mutt is free software, and you are welcome to redistribute it\n"
 +      "under certain conditions; type `mutt -vv' for details.\n"
 +);
 +
 +struct compile_options {
 +      const char *name;
 +      int enabled;
 +};
 +
 +static struct compile_options comp_opts[] = {
 +#ifdef CRYPT_BACKEND_CLASSIC_PGP
 +      { "CRYPT_BACKEND_CLASSIC_PGP", 1 },
 +#else
 +      { "CRYPT_BACKEND_CLASSIC_PGP", 0 },
 +#endif
 +#ifdef CRYPT_BACKEND_CLASSIC_SMIME
 +      { "CRYPT_BACKEND_CLASSIC_SMIME", 1 },
 +#else
 +      { "CRYPT_BACKEND_CLASSIC_SMIME", 0 },
 +#endif
 +#ifdef CRYPT_BACKEND_GPGME
 +      { "CRYPT_BACKEND_GPGME", 1 },
 +#else
 +      { "CRYPT_BACKEND_GPGME", 0 },
 +#endif
 +#ifdef DEBUG
 +      { "DEBUG", 1 },
 +#else
 +      { "DEBUG", 0 },
 +#endif
 +#ifdef DL_STANDALONE
 +      { "DL_STANDALONE", 1 },
 +#else
 +      { "DL_STANDALONE", 0 },
 +#endif
 +#ifdef ENABLE_NLS
 +      { "ENABLE_NLS", 1 },
 +#else
 +      { "ENABLE_NLS", 0 },
 +#endif
 +#ifdef EXACT_ADDRESS
 +      { "EXACT_ADDRESS", 1 },
 +#else
 +      { "EXACT_ADDRESS", 0 },
 +#endif
 +#ifdef HOMESPOOL
 +      { "HOMESPOOL", 1 },
 +#else
 +      { "HOMESPOOL", 0 },
 +#endif
 +#ifdef LOCALES_HACK
 +      { "LOCALES_HACK", 1 },
 +#else
 +      { "LOCALES_HACK", 0 },
 +#endif
 +#ifdef SUN_ATTACHMENT
 +      { "SUN_ATTACHMENT", 1 },
 +#else
 +      { "SUN_ATTACHMENT", 0 },
 +#endif
 +#ifdef HAVE_BKGDSET
 +      { "HAVE_BKGDSET", 1 },
 +#else
 +      { "HAVE_BKGDSET", 0 },
 +#endif
 +#ifdef HAVE_COLOR
 +      { "HAVE_COLOR", 1 },
 +#else
 +      { "HAVE_COLOR", 0 },
 +#endif
 +#ifdef HAVE_CURS_SET
 +      { "HAVE_CURS_SET", 1 },
 +#else
 +      { "HAVE_CURS_SET", 0 },
 +#endif
 +#ifdef HAVE_GETADDRINFO
 +      { "HAVE_GETADDRINFO", 1 },
 +#else
 +      { "HAVE_GETADDRINFO", 0 },
 +#endif
 +#ifdef HAVE_GETSID
 +      { "HAVE_GETSID", 1 },
 +#else
 +      { "HAVE_GETSID", 0 },
 +#endif
 +#ifdef HAVE_ICONV
 +      { "HAVE_ICONV", 1 },
 +#else
 +      { "HAVE_ICONV", 0 },
 +#endif
 +#ifdef HAVE_LANGINFO_CODESET
 +      { "HAVE_LANGINFO_CODESET", 1 },
 +#else
 +      { "HAVE_LANGINFO_CODESET", 0 },
 +#endif
 +#ifdef HAVE_LANGINFO_YESEXPR
 +      { "HAVE_LANGINFO_YESEXPR", 1 },
 +#else
 +      { "HAVE_LANGINFO_YESEXPR", 0 },
 +#endif
 +#ifdef HAVE_LIBIDN
 +      { "HAVE_LIBIDN", 1 },
 +#else
 +      { "HAVE_LIBIDN", 0 },
 +#endif
 +#ifdef HAVE_META
 +      { "HAVE_META", 1 },
 +#else
 +      { "HAVE_META", 0 },
 +#endif
 +#ifdef HAVE_REGCOMP
 +      { "HAVE_REGCOMP", 1 },
 +#else
 +      { "HAVE_REGCOMP", 0 },
 +#endif
 +#ifdef HAVE_RESIZETERM
 +      { "HAVE_RESIZETERM", 1 },
 +#else
 +      { "HAVE_RESIZETERM", 0 },
 +#endif
 +#ifdef HAVE_START_COLOR
 +      { "HAVE_START_COLOR", 1 },
 +#else
 +      { "HAVE_START_COLOR", 0 },
 +#endif
 +#ifdef HAVE_TYPEAHEAD
 +      { "HAVE_TYPEAHEAD", 1 },
 +#else
 +      { "HAVE_TYPEAHEAD", 0 },
 +#endif
 +#ifdef HAVE_WC_FUNCS
 +      { "HAVE_WC_FUNCS", 1 },
 +#else
 +      { "HAVE_WC_FUNCS", 0 },
 +#endif
 +#ifdef ICONV_NONTRANS
 +      { "ICONV_NONTRANS", 1 },
 +#else
 +      { "ICONV_NONTRANS", 0 },
 +#endif
++#ifdef USE_COMPRESSED
++      { "USE_COMPRESSED", 1 },
++#else
++      { "USE_COMPRESSED", 0 },
++#endif
 +#ifdef USE_DOTLOCK
 +      { "USE_DOTLOCK", 1 },
 +#else
 +      { "USE_DOTLOCK", 0 },
 +#endif
 +#ifdef USE_FCNTL
 +      { "USE_FCNTL", 1 },
 +#else
 +      { "USE_FCNTL", 0 },
 +#endif
 +#ifdef USE_FLOCK
 +      { "USE_FLOCK", 1 },
 +#else
 +      { "USE_FLOCK", 0 },
 +#endif
 +#ifdef USE_GNU_REGEX
 +      { "USE_GNU_REGEX", 1 },
 +#else
 +      { "USE_GNU_REGEX", 0 },
 +#endif
 +#ifdef USE_GSS
 +      { "USE_GSS", 1 },
 +#else
 +      { "USE_GSS", 0 },
 +#endif
 +#ifdef USE_HCACHE
 +      { "USE_HCACHE", 1 },
 +#else
 +      { "USE_HCACHE", 0 },
 +#endif
 +#ifdef USE_IMAP
 +      { "USE_IMAP", 1 },
 +#else
 +      { "USE_IMAP", 0 },
 +#endif
 +#ifdef USE_NOTMUCH
 +      { "USE_NOTMUCH", 1 },
 +#else
 +      { "USE_NOTMUCH", 0 },
 +#endif
 +#ifdef USE_POP
 +      { "USE_POP", 1 },
 +#else
 +      { "USE_POP", 0 },
 +#endif
 +#ifdef USE_SASL
 +      { "USE_SASL", 1 },
 +#else
 +      { "USE_SASL", 0 },
 +#endif
 +#ifdef USE_SETGID
 +      { "USE_SETGID", 1 },
 +#else
 +      { "USE_SETGID", 0 },
 +#endif
 +#ifdef USE_SIDEBAR
 +      { "USE_SIDEBAR", 1 },
 +#else
 +      { "USE_SIDEBAR", 0 },
 +#endif
 +#ifdef USE_SMTP
 +      { "USE_SMTP", 1 },
 +#else
 +      { "USE_SMTP", 0 },
 +#endif
 +#ifdef USE_SSL_GNUTLS
 +      { "USE_SSL_GNUTLS", 1 },
 +#else
 +      { "USE_SSL_GNUTLS", 0 },
 +#endif
 +#ifdef USE_SSL_OPENSSL
 +      { "USE_SSL_OPENSSL", 1 },
 +#else
 +      { "USE_SSL_OPENSSL", 0 },
 +#endif
 +      { NULL, 0 }
 +};
 +
 +/**
 + * print_compile_options - Print a list of enabled/disabled features
 + *
 + * The configure script lets uses enable/disable features.
 + * This shows the Mutt user which features are/aren't available.
 + *
 + * The output is of the form: "+ENABLED_FEATURE -DISABLED_FEATURE" and is
 + * wrapped to SCREEN_WIDTH characters.
 + */
 +static void
 +print_compile_options (void)
 +{
 +      int i;
 +      char c;
 +      int len;
 +      int used = 0;
 +
 +      for (i = 0; comp_opts[i].name; i++) {
 +              len = strlen (comp_opts[i].name) + 2;   /* +/- and a space */
 +              if ((used + len) > SCREEN_WIDTH) {
 +                      used = 0;
 +                      puts ("");
 +              }
 +              used += len;
 +              c = comp_opts[i].enabled ? '+' : '-';
 +              printf ("%c%s ", c, comp_opts[i].name);
 +      }
 +      puts ("");
 +}
 +
 +/**
 + * rstrip_in_place - Strip a trailing carriage return
 + * @s:  String to be modified
 + *
 + * The string has its last carriage return set to NUL.
 + * Returns:
 + *    The modified string
 + */
 +static char *
 +rstrip_in_place (char *s)
 +{
 +      if (!s)
 +              return NULL;
 +
 +      char *p;
 +
 +      p = &s[strlen (s)];
 +      if (p == s)
 +              return s;
 +      p--;
 +      while ((p >= s) && ((*p == '\n') || (*p == '\r')))
 +              *p-- = '\0';
 +      return s;
 +}
 +
 +/**
 + * print_version - Print system and compile info
 + *
 + * Print information about the current system Mutt is running on.
 + * Also print a list of all the compile-time information.
 + */
 +void
 +print_version (void)
 +{
 +      struct utsname uts;
 +
 +      puts (mutt_make_version());
 +      puts (_(Notice));
 +
 +      uname (&uts);
 +
 +#ifdef _AIX
 +      printf ("System: %s %s.%s", uts.sysname, uts.version, uts.release);
 +#elif defined (SCO)
 +      printf ("System: SCO %s", uts.release);
 +#else
 +      printf ("System: %s %s", uts.sysname, uts.release);
 +#endif
 +
 +      printf (" (%s)", uts.machine);
 +
 +#ifdef NCURSES_VERSION
 +      printf ("\nncurses: %s (compiled with %s)", curses_version(), NCURSES_VERSION);
 +#elif defined (USE_SLANG_CURSES)
 +      printf ("\nslang: %d", SLANG_VERSION);
 +#endif
 +
 +#ifdef _LIBICONV_VERSION
 +      printf ("\nlibiconv: %d.%d", _LIBICONV_VERSION >> 8,
 +              _LIBICONV_VERSION & 0xff);
 +#endif
 +
 +#ifdef HAVE_LIBIDN
 +      printf ("\nlibidn: %s (compiled with %s)", stringprep_check_version (NULL),
 +              STRINGPREP_VERSION);
 +#endif
 +
 +#ifdef USE_HCACHE
 +      printf ("\nhcache backend: %s", mutt_hcache_backend());
 +#endif
 +
 +      puts ("\n\nCompiler:");
 +      rstrip_in_place ((char *) cc_version);
 +      puts (cc_version);
 +
 +      rstrip_in_place ((char *) configure_options);
 +      printf ("\nConfigure options: %s\n", configure_options);
 +
 +      rstrip_in_place ((char *) cc_cflags);
 +      printf ("\nCompilation CFLAGS: %s\n", cc_cflags);
 +
 +      puts (_("\nCompile options:"));
 +      print_compile_options();
 +
 +#ifdef DOMAIN
 +      printf ("DOMAIN=\"%s\"\n", DOMAIN);
 +#else
 +      puts ("-DOMAIN");
 +#endif
 +
 +#ifdef MIXMASTER
 +      printf ("MIXMASTER=\"%s\"\n", MIXMASTER);
 +#else
 +      puts ("-MIXMASTER");
 +#endif
 +
 +#ifdef ISPELL
 +      printf ("ISPELL=\"%s\"\n", ISPELL);
 +#else
 +      puts ("-ISPELL");
 +#endif
 +
 +      printf ("SENDMAIL=\"%s\"\n", SENDMAIL);
 +      printf ("MAILPATH=\"%s\"\n", MAILPATH);
 +      printf ("PKGDATADIR=\"%s\"\n", PKGDATADIR);
 +      printf ("SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
 +      printf ("EXECSHELL=\"%s\"\n", EXECSHELL);
 +
 +      puts ("");
 +      mutt_print_patchlist();
 +
 +      puts ("");
 +      puts (_(ReachingUs));
 +}
 +
 +/**
 + * print_copyright - Print copyright message
 + *
 + * Print the authors' copyright messages, the GPL license and some contact
 + * information for the Mutt project.
 + */
 +void
 +print_copyright (void)
 +{
 +      puts (mutt_make_version());
 +      puts (_(Copyright));
 +      puts (_(License));
 +      puts (_(Obtaining));
 +      puts (_(ReachingUs));
 +}
 +
 +/**
 + * feature_enabled - Test is a compile-time feature is enabled
 + * @name:  Compile-time symbol of the feature
 + *
 + * Many of the larger features of mutt can be disabled at compile time.
 + * They define a symbol and use #ifdef's around their code.
 + * The symbols are mirrored in "struct compile_options comp_opts[]" in this
 + * file.
 + *
 + * This function checks if one of these symbols is present in the code.
 + *
 + * These symbols are also seen in the output of "mutt -v".
 + *
 + * Returns:
 + *    1: Feature enables
 + *    0: Feature not enabled, or not compiled in
 + */
 +int
 +feature_enabled (const char *name)
 +{
 +      if (!name)
 +              return 0;
 +
 +      int i;
 +      for (i = 0; comp_opts[i].name; i++) {
 +              if (mutt_strcmp (name, comp_opts[i].name) == 0) {
 +                      return 1;
 +              }
 +      }
 +      return 0;
 +}
 +