Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2012-09-23 08:05:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2012-07-09 09:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2012-09-23 08:05:51.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 18 15:47:45 UTC 2012 - [email protected] + +- Add back lost sidebar color patch. + +------------------------------------------------------------------- New: ---- nion.sidebar-color.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.WqROVp/_old 2012-09-23 08:05:54.000000000 +0200 +++ /var/tmp/diff_new_pack.WqROVp/_new 2012-09-23 08:05:54.000000000 +0200 @@ -92,6 +92,7 @@ Patch11: aw.listreply.diff Patch12: patch-1.5.21.vk.pgp_verbose_mime Patch13: automake-1.12.patch +Patch14: nion.sidebar-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -121,6 +122,7 @@ %patch11 -p1 -b .listreply %patch12 -p1 -b .pgp_verbose_mtime %patch13 -p1 -b .automake-1.12 +%patch14 -p1 -b .sidebar.color cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++++++ nion.sidebar-color.diff ++++++ diff --git a/color.c b/color.c index bb6cbb4..bbf20a3 100644 --- a/color.c +++ b/color.c @@ -95,6 +95,7 @@ static struct mapping_t Fields[] = { "index", MT_COLOR_INDEX }, { "sidebar_new", MT_COLOR_NEW }, { "sidebar_flagged", MT_COLOR_FLAGGED }, + { "sidebar", MT_COLOR_SIDEBAR }, { NULL, 0 } }; @@ -144,6 +145,7 @@ void ci_start_color (void) /* set some defaults */ ColorDefs[MT_COLOR_STATUS] = A_REVERSE; + ColorDefs[MT_COLOR_SIDEBAR] = A_REVERSE; ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE; ColorDefs[MT_COLOR_SEARCH] = A_REVERSE; ColorDefs[MT_COLOR_MARKERS] = A_REVERSE; diff --git a/mutt_curses.h b/mutt_curses.h index 5f61048..cb1acf2 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -125,6 +125,7 @@ enum MT_COLOR_ATTACHMENT, MT_COLOR_SEARCH, MT_COLOR_BOLD, + MT_COLOR_SIDEBAR, MT_COLOR_UNDERLINE, MT_COLOR_INDEX, MT_COLOR_NEW, diff --git a/sidebar.c b/sidebar.c index 9e12319..4b37b76 100644 --- a/sidebar.c +++ b/sidebar.c @@ -195,22 +195,26 @@ int draw_sidebar(int menu) { } /* get attributes for divider */ - SETCOLOR(MT_COLOR_STATUS); + SETCOLOR(MT_COLOR_SIDEBAR); #ifndef USE_SLANG_CURSES attr_get(&attrs, &color_pair, 0); #else color_pair = attr_get(); #endif - SETCOLOR(MT_COLOR_NORMAL); + /* SETCOLOR(MT_COLOR_SIDEBAR); */ /* draw the divider */ for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) { move(lines, SidebarWidth - delim_len); - addstr(NONULL(SidebarDelim)); -#ifndef USE_SLANG_CURSES - mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); -#endif + if (option (OPTASCIICHARS)) + addstr (NONULL (SidebarDelim)); + else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|")) + addch (ACS_VLINE); + else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|")) + addstr ("\342\224\202"); + else + addstr (NONULL (SidebarDelim)); } if ( Incoming == 0 ) return 0; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
