merge: sidebar

 * add ident to PATCHES
 * feature: sidebar
 * sidebar_on_right

diff --cc PATCHES
index c9f5d3e12edef3ecd4d2d902d7f357f07938b6e9,3574d541a2533766ec892b203e2e261b38987096..0037433c50c5701f50ecd2c08f749f8a54cde11f
--- 1/PATCHES
--- 2/PATCHES
+++ b/PATCHES
@@@ -1,17 -1,1 +1,18 @@@
 +patch-compress-neomutt
 +patch-cond-date-neomutt
 +patch-fmemopen-neomutt
 +patch-ifdef-neomutt
 +patch-index-color-neomutt
 +patch-initials-neomutt
 +patch-keywords-neomutt
 +patch-limit-current-thread-neomutt
 +patch-lmdb-neomutt
 +patch-nested-if-neomutt
 +patch-new-mail-neomutt
 +patch-progress-neomutt
 +patch-quasi-delete-neomutt
+ patch-sidebar-neomutt
 +patch-skip-quoted-neomutt
 +patch-smime-encrypt-self-neomutt
 +patch-status-color-neomutt
 +patch-tls-sni-neomutt

diff --cc configure.ac
index 31cad0b4583a4310cb6e25ca9daf2aeb1490ca37,c032c08c36c7b3caa5a0f65ad0c23ff18620c597..6585e9007dc98d66dccdb5096e0e0bf9a2fee7be
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -175,23 -175,13 +175,22 @@@ 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"
-                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS sidebar.o"
-         fi
+ AC_ARG_ENABLE(sidebar, AC_HELP_STRING([--enable-sidebar], [Enable Sidebar support]), enable_sidebar=$enableval, enable_sidebar=no)
+ AS_IF([test x$enable_sidebar = "xyes"], [
+          AC_DEFINE(USE_SIDEBAR, 1, [Define if you want support for the sidebar.])
+          OPS="$OPS \$(srcdir)/OPS.SIDEBAR"
+          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS sidebar.o"
  ])
  
 +AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]),
 +              enable_compressed=$enableval, enable_compressed=no
 +)
 +AS_IF([test x$enable_compressed = "xyes"], [
 +         AC_DEFINE(USE_COMPRESSED, 1, [Define to enable compressed folders support.])
 +         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS compress.o"
 +])
 +AM_CONDITIONAL(BUILD_COMPRESS, test x$enable_compressed = xyes)
 +
  AC_ARG_WITH(mixmaster, AS_HELP_STRING([--with-mixmaster@<:@=PATH@:>@],[Include Mixmaster support]),
    [if test "$withval" != no
     then

diff --cc curs_lib.c
Simple merge

diff --cc globals.h
Simple merge

diff --cc init.h
Simple merge

diff --cc mutt.h
Simple merge

diff --cc mx.c
Simple merge