From 15c23e502a2dcbc20bd179107bb384c99d30dc9d Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sat, 30 Apr 2011 19:18:47 +0100 Subject: [PATCH] sidebar: don't overwrite the status if status_on_top is enabled (Closes: 494735) --- debian/changelog | 2 ++ debian/patches/mutt-patched/sidebar | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 35b41fb..5c50b7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ mutt (1.5.21-5) unstable; urgency=low * debian/patches/mutt-patched: + sidebar: patch replaced with the one written by Stuart Henderson (Closes: 619822) + + sidebar: don't overwrite the status if status_on_top is enabled + (Closes: 494735) + sidebar-{dotted,sorted}: documented the options that those two patches are introducing; documentation submitted by Julien Valroff (Closes: 603186) + sidebar-sorted: use strcoll() to sort the sidebar using the locale diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar index 1e4a6b8..f541c23 100644 --- a/debian/patches/mutt-patched/sidebar +++ b/debian/patches/mutt-patched/sidebar @@ -965,7 +965,7 @@ in the "mutt-patched" package. break; --- /dev/null +++ b/sidebar.c -@@ -0,0 +1,333 @@ +@@ -0,0 +1,336 @@ +/* + * Copyright (C) ????-2004 Justin Hibbits + * Copyright (C) 2004 Thomer M. Gil @@ -1105,6 +1105,8 @@ in the "mutt-patched" package. +int draw_sidebar(int menu) { + + int lines = option(OPTHELP) ? 1 : 0; ++ lines += option(OPTSTATUSONTOP) ? 1 : 0; ++ + BUFFY *tmp; +#ifndef USE_SLANG_CURSES + attr_t attrs; @@ -1184,6 +1186,7 @@ in the "mutt-patched" package. + + if ( Incoming == 0 ) return 0; + lines = option(OPTHELP) ? 1 : 0; /* go back to the top */ ++ lines += option(OPTSTATUSONTOP) ? 1 : 0; + + if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) + calc_boundaries(menu); -- 2.43.0