missing files for 20160611

Author: flatcap

…es-extra/0008-feature-progress-bar.patch …es-extra/0001-feature-progress-bar.patchfeatures-extra/0008-feature-progress-bar.patch renamed to features-extra/0001-feature-progress-bar.patch features-extra/0008-feature-progress-bar.patch renamed to features-extra/0001-feature-progress-bar.patch

@@ -1,7 +1,7 @@
-From f54b8bcac685535c857878eab4a847aa8ce91afc Mon Sep 17 00:00:00 2001
+From a202c641c734e113bf743bccffe236fca1be0982 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:17:59 +0100
-Subject: [PATCH 08/18] feature: progress bar
+Subject: [PATCH 01/11] feature: progress bar
 
 ---
  PATCHES             |   1 +
@@ -174,7 +174,7 @@ index 3178f22..1ab6d2d 100644
    }
 
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index a1364db..82459b8 100644
+index 676ed6a..239f955 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -3323,6 +3323,7 @@ <sect1 id="color">
@@ -339,7 +339,7 @@ index 0000000..a632dc0
 +
 +" vim: syntax=vim
 diff --git a/mutt_curses.h b/mutt_curses.h
-index fbcbb87..6f63160 100644
+index 2bfa1ae..75ea85a 100644
 --- a/mutt_curses.h
 +++ b/mutt_curses.h
 @@ -135,6 +135,7 @@ enum

…res-extra/0009-feature-skip-quoted.patch …res-extra/0002-feature-skip-quoted.patchfeatures-extra/0009-feature-skip-quoted.patch renamed to features-extra/0002-feature-skip-quoted.patch features-extra/0009-feature-skip-quoted.patch renamed to features-extra/0002-feature-skip-quoted.patch

@@ -1,7 +1,7 @@
-From 5ce7afaccdb9357b5592c34dda126682d574c72e Mon Sep 17 00:00:00 2001
+From 704c624598267226af34db127c6a7fa8e00efe02 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:19:14 +0100
-Subject: [PATCH 09/18] feature: skip-quoted
+Subject: [PATCH 02/11] feature: skip-quoted
 
 ---
  PATCHES                |   1 +
@@ -78,7 +78,7 @@ index 0000000..e9b0ac3
 +    * Richard Russon <rich@flatcap.org>
 +
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index 82459b8..4637b82 100644
+index 239f955..e5c4a66 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -10640,6 +10640,127 @@ <sect1 id="sidebar">
@@ -238,27 +238,27 @@ index c4a77ca..94640b3 100644
  WHERE short Timeout;
  WHERE short Wrap;
 diff --git a/init.h b/init.h
-index 292bdc7..6996359 100644
+index 71d170c..b46a3ea 100644
 --- a/init.h
 +++ b/init.h
-@@ -2848,6 +2848,12 @@ struct option_t MuttVars[] = {
+@@ -2849,6 +2849,12 @@ struct option_t MuttVars[] = {
    ** replacing ``%s'' with the supplied string.
    ** For the default value, ``joe'' would be expanded to: ``~f joe | ~s joe''.
    */
 +  { "skip_quoted_offset", DT_NUM, R_NONE, UL &SkipQuotedOffset, 0 },
 +  /*
 +  ** .pp
 +  ** Lines of quoted text that are displayed before the unquoted text after
-+  ** 'skip to quoted' command (S)
++  ** "skip to quoted" command (S)
 +  */
    { "sleep_time",	DT_NUM, R_NONE, UL &SleepTime, 1 },
    /*
    ** .pp
 diff --git a/pager.c b/pager.c
-index 94dcdd8..03f231e 100644
+index b4b8889..d4697ba 100644
 --- a/pager.c
 +++ b/pager.c
-@@ -2292,11 +2292,11 @@ search_next:
+@@ -2289,11 +2289,11 @@ search_next:
  	  int dretval = 0;
  	  int new_topline = topline;
 
@@ -272,7 +272,7 @@ index 94dcdd8..03f231e 100644
  	    new_topline++;
 
  	  if (dretval < 0)
-@@ -2305,11 +2305,11 @@ search_next:
+@@ -2302,11 +2302,11 @@ search_next:
  	    break;
  	  }
 

…es-extra/0010-feature-status-color.patch …es-extra/0003-feature-status-color.patchfeatures-extra/0010-feature-status-color.patch renamed to features-extra/0003-feature-status-color.patch features-extra/0010-feature-status-color.patch renamed to features-extra/0003-feature-status-color.patch

@@ -1,7 +1,7 @@
-From 1cad34f8043331f0845ad1760f4472950c5359aa Mon Sep 17 00:00:00 2001
+From 49da143a1ea385aa80f9d385c21b94844a388cc7 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:22:39 +0100
-Subject: [PATCH 10/18] feature: status-color
+Subject: [PATCH 03/11] feature: status-color
 
 ---
  PATCHES                 |   1 +
@@ -197,7 +197,7 @@ index e2ff989..0efc743 100644
    }
    else if (object == MT_COLOR_QUOTED)
 diff --git a/curs_main.c b/curs_main.c
-index a241fe6..d23f33c 100644
+index f6f5550..0b660ea 100644
 --- a/curs_main.c
 +++ b/curs_main.c
 @@ -482,6 +482,112 @@ static void resort_index (MUTTMENU *menu)
@@ -315,15 +315,15 @@ index a241fe6..d23f33c 100644
    { N_("Del"),   OP_DELETE },
 @@ -667,7 +773,7 @@ int mutt_index_menu (void)
  #ifdef USE_SIDEBAR
- 	sb_set_buffystats (Context);
+ 	mutt_sb_set_buffystats (Context);
  #endif
 -	mutt_paddstr (COLS, buf);
 +	mutt_draw_statusline (COLS, buf);
  	NORMAL_COLOR;
  	menu->redraw &= ~REDRAW_STATUS;
  	if (option(OPTTSENABLED) && TSSupported)
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index 4637b82..6417cf6 100644
+index e5c4a66..633ac6a 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -10761,6 +10761,209 @@ <sect1 id="skip-quoted-patch">
@@ -592,7 +592,7 @@ index 0000000..385396f
 +
 +# vim: syntax=muttrc
 diff --git a/mutt_curses.h b/mutt_curses.h
-index 6f63160..514f12d 100644
+index 75ea85a..69d06c5 100644
 --- a/mutt_curses.h
 +++ b/mutt_curses.h
 @@ -142,6 +142,7 @@ enum
@@ -603,7 +603,7 @@ index 6f63160..514f12d 100644
    char *pattern;
    pattern_t *color_pattern; /* compiled pattern to speed up index color
                                 calculation */
-@@ -188,6 +189,7 @@ extern int ColorQuoteUsed;
+@@ -192,6 +193,7 @@ extern int ColorQuoteUsed;
  extern int ColorDefs[];
  extern COLOR_LINE *ColorHdrList;
  extern COLOR_LINE *ColorBodyList;
@@ -612,10 +612,10 @@ index 6f63160..514f12d 100644
 
  void ci_init_color (void);
 diff --git a/pager.c b/pager.c
-index 03f231e..5865eb3 100644
+index d4697ba..227727e 100644
 --- a/pager.c
 +++ b/pager.c
-@@ -1833,13 +1833,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1830,13 +1830,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
  	size_t l2 = sizeof (buffer);
  	hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
  	mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);

…res-extra/0011-feature-index-color.patch …res-extra/0004-feature-index-color.patchfeatures-extra/0011-feature-index-color.patch renamed to features-extra/0004-feature-index-color.patch features-extra/0011-feature-index-color.patch renamed to features-extra/0004-feature-index-color.patch

@@ -1,7 +1,7 @@
-From 52b2949e1065d6a1b22cdd0411b4a5252c26fad4 Mon Sep 17 00:00:00 2001
+From 7285e297e987b92ca5d66ce23116b9b22fbb7475 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:26:21 +0100
-Subject: [PATCH 11/18] feature: index-color
+Subject: [PATCH 04/11] feature: index-color
 
 ---
  PATCHES                |   1 +
@@ -377,7 +377,7 @@ index 1ab6d2d..eb06c36 100644
      {
        k = (k == (size_t)(-1)) ? 1 : n;
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index 6417cf6..2011d8b 100644
+index 633ac6a..acdb199 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -3259,7 +3259,7 @@ <sect1 id="color">
@@ -999,7 +999,7 @@ index 0d332bd..7fbc357 100644
        break;
 
 diff --git a/menu.c b/menu.c
-index 8eed91c..7839205 100644
+index 6b58e1f..ab9a066 100644
 --- a/menu.c
 +++ b/menu.c
 @@ -30,7 +30,39 @@
@@ -1128,7 +1128,7 @@ index 765f8f5..51c9e51 100644
  #define M_THREAD_UNCOLLAPSE	(1<<1)
  #define M_THREAD_GET_HIDDEN	(1<<2)
 diff --git a/mutt_curses.h b/mutt_curses.h
-index 514f12d..254b768 100644
+index 69d06c5..9c4eeb1 100644
 --- a/mutt_curses.h
 +++ b/mutt_curses.h
 @@ -125,7 +125,6 @@ enum
@@ -1157,7 +1157,7 @@ index 514f12d..254b768 100644
    MT_COLOR_MAX
  };
 
-@@ -191,6 +201,9 @@ extern COLOR_LINE *ColorHdrList;
+@@ -195,6 +205,9 @@ extern COLOR_LINE *ColorHdrList;
  extern COLOR_LINE *ColorBodyList;
  extern COLOR_LINE *ColorStatusList;
  extern COLOR_LINE *ColorIndexList;

features-extra/0012-feature-tls-sni.patch features-extra/0005-feature-tls-sni.patchfeatures-extra/0012-feature-tls-sni.patch renamed to features-extra/0005-feature-tls-sni.patch

@@ -1,7 +1,7 @@
-From 9abb4322baff8808b1104b8c35d45fe2b149f8ee Mon Sep 17 00:00:00 2001
+From b688e28e93b55041fb5e96f554eeb71ed984c454 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:27:07 +0100
-Subject: [PATCH 12/18] feature: tls sni
+Subject: [PATCH 05/11] feature: tls sni
 
 ---
  PATCHES             |   1 +
@@ -125,7 +125,7 @@ index 0000000..7ff94d8
 +    * Richard Russon <rich@flatcap.org>
 +
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index 2011d8b..cf7c0a6 100644
+index acdb199..e5c5098 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -11216,6 +11216,113 @@ <sect1 id="status-color">

…es-extra/0013-feature-quasi-delete.patch …es-extra/0006-feature-quasi-delete.patchfeatures-extra/0013-feature-quasi-delete.patch renamed to features-extra/0006-feature-quasi-delete.patch features-extra/0013-feature-quasi-delete.patch renamed to features-extra/0006-feature-quasi-delete.patch

@@ -1,7 +1,7 @@
-From c50e03c7c53ff378749a2b3cd77af45d558c85ad Mon Sep 17 00:00:00 2001
+From 0638e30b5d7e88bf629f416061cade677cf2efbe Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:28:23 +0100
-Subject: [PATCH 13/18] feature: quasi-delete
+Subject: [PATCH 06/11] feature: quasi-delete
 
 ---
  OPS                     |   1 +
@@ -96,7 +96,7 @@ index 0000000..2a47346
 +    * Richard Russon <rich@flatcap.org>
 +
 diff --git a/curs_main.c b/curs_main.c
-index d23f33c..1d5d8c1 100644
+index 0b660ea..56821e9 100644
 --- a/curs_main.c
 +++ b/curs_main.c
 @@ -1293,6 +1293,20 @@ int mutt_index_menu (void)
@@ -121,7 +121,7 @@ index d23f33c..1d5d8c1 100644
        case OP_SIDEBAR_OPEN:
  #endif
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index cf7c0a6..d5ea867 100644
+index e5c5098..76022ae 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -10429,6 +10429,126 @@ <sect1 id="progress">
@@ -308,10 +308,10 @@ index 51c9e51..40e2de6 100644
    unsigned int attach_del : 1; 		/* has an attachment marked for deletion */
    unsigned int old : 1;
 diff --git a/mx.c b/mx.c
-index 60c1ec1..17f9222 100644
+index 4a2ca3c..6ee50ad 100644
 --- a/mx.c
 +++ b/mx.c
-@@ -1136,9 +1136,10 @@ void mx_update_tables(CONTEXT *ctx, int committing)
+@@ -1137,9 +1137,10 @@ void mx_update_tables(CONTEXT *ctx, int committing)
  #define this_body ctx->hdrs[j]->content
    for (i = 0, j = 0; i < ctx->msgcount; i++)
    {

…atures-extra/0014-feature-fmemopen.patch …atures-extra/0007-feature-fmemopen.patchfeatures-extra/0014-feature-fmemopen.patch renamed to features-extra/0007-feature-fmemopen.patch features-extra/0014-feature-fmemopen.patch renamed to features-extra/0007-feature-fmemopen.patch

@@ -1,7 +1,7 @@
-From 31ae63b3c80f41e5c8a93cbcbf635819007e93a5 Mon Sep 17 00:00:00 2001
+From a70fdf7a25630b9c53275214dcf5a816f7fa0b51 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:29:02 +0100
-Subject: [PATCH 14/18] feature: fmemopen
+Subject: [PATCH 07/11] feature: fmemopen
 
 ---
  PATCHES             |   1 +
@@ -78,10 +78,10 @@ index 0000000..adab594
 +    * Richard Russon <rich@flatcap.org>
 +
 diff --git a/configure.ac b/configure.ac
-index 54a7400..1fe1932 100644
+index 6bf08a1..50c2666 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1325,6 +1325,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; then
+@@ -1324,6 +1324,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; then
    AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
  fi
 
@@ -91,7 +91,7 @@ index 54a7400..1fe1932 100644
  have_openjade="no"
  AC_PATH_PROG([OSPCAT], [ospcat], [none])
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index d5ea867..4c4936d 100644
+index 76022ae..a1689b2 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -9581,6 +9581,109 @@ <sect1 id="cond-date">

…/0015-feature-limit-current-thread.patch …/0008-feature-limit-current-thread.patchfeatures-extra/0015-feature-limit-current-thread.patch renamed to features-extra/0008-feature-limit-current-thread.patch features-extra/0015-feature-limit-current-thread.patch renamed to features-extra/0008-feature-limit-current-thread.patch

@@ -1,7 +1,7 @@
-From 13838fd3c32af1dae94773a6f4d195f575b56355 Mon Sep 17 00:00:00 2001
+From 028adbd1d14b431e5e8a81fd9a08fcde51e1b9f4 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Tue, 24 May 2016 17:29:47 +0100
-Subject: [PATCH 15/18] feature: limit-current-thread
+Subject: [PATCH 08/11] feature: limit-current-thread
 
 ---
  OPS                             |   1 +
@@ -90,7 +90,7 @@ index 0000000..072413e
 +    * Richard Russon <rich@flatcap.org>
 +
 diff --git a/curs_main.c b/curs_main.c
-index 1d5d8c1..8b84c48 100644
+index 56821e9..109f42a 100644
 --- a/curs_main.c
 +++ b/curs_main.c
 @@ -1044,12 +1044,14 @@ int mutt_index_menu (void)
@@ -110,7 +110,7 @@ index 1d5d8c1..8b84c48 100644
  	  if (menu->oldcurrent >= 0)
  	  {
 diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index 4c4936d..6eba963 100644
+index a1689b2..0e17cf4 100644
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
 @@ -10197,6 +10197,125 @@ <sect1 id="initials">