[mutt] 01/01: Dropped neomutt-devel/837601-do-not-segfault-on-new-mails.patch which caused an extra empty line to be added to the pager.

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit d4533d226c711cf7cd476b48f2377ba1e23072ba
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Oct 16 20:20:04 2016 +0100

    Dropped neomutt-devel/837601-do-not-segfault-on-new-mails.patch which caused an extra empty line to be added to the pager.
---
 debian/changelog                                   |  7 +++++
 .../837601-do-not-segfault-on-new-mails.patch      | 32 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24032a5..1b79886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mutt (1.7.1-2) unstable; urgency=medium
+
+  * Dropped neomutt-devel/837601-do-not-segfault-on-new-mails.patch which
+    caused an extra empty line to be added to the pager.
+
+ -- Antonio Radici <antonio at debian.org>  Sun, 16 Oct 2016 20:17:38 +0100
+
 mutt (1.7.1-1) unstable; urgency=medium
 
   * New upstream Mutt release.
diff --git a/debian/patches/neomutt-devel/837601-do-not-segfault-on-new-mails.patch b/debian/patches/neomutt-devel/837601-do-not-segfault-on-new-mails.patch
deleted file mode 100644
index 5cfee1f..0000000
--- a/debian/patches/neomutt-devel/837601-do-not-segfault-on-new-mails.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Prevent neomutt from crashing when a new mail arrive and you are in the pager.
-
-This patch is a temporary fix, upstream (neomutt) has to confirm that it is OK
-in the rest of the code, in the meantime we will keep it as it prevents the
-crash.
-
-Debian bug: http://bugs.debian.org/837601
-Neomutt issue: https://github.com/neomutt/neomutt/issues/143
-
---- a/pager.c
-+++ b/pager.c
-@@ -1776,7 +1776,7 @@
-       memcpy (pager_status_window, MuttStatusWindow, sizeof(mutt_window_t));
-       index_status_window->rows = index_window->rows = 0;
- 
--      if (IsHeader (extra) && PagerIndexLines)
-+      if (IsHeader (extra))
-       {
-         memcpy (index_window, MuttIndexWindow, sizeof(mutt_window_t));
-         index_window->rows = indexlen > 0 ? indexlen - 1 : 0;
---- a/curs_main.c
-+++ b/curs_main.c
-@@ -377,6 +377,9 @@
-   if (!menu || !ctx)
-     return;
- 
-+  if (!menu || !ctx)
-+    return;
-+
-   /* take note of the current message */
-   if (oldcount)
-   {
diff --git a/debian/patches/series b/debian/patches/series
index 3922156..55d0a76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 neomutt-20161014.patch
-neomutt-devel/837601-do-not-segfault-on-new-mails.patch
 neomutt-devel/832971-reset-xlabel.patch
 debian-specific/Muttrc.patch
 debian-specific/Md.etc_mailname_gethostbyname.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git