diff --git a/screen.changes b/screen.changes index 143547a..571dbb3 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Mar 24 10:57:09 UTC 2013 - trenn@suse.de + +- Patch screen_enhance_windows_list_1_3.patch changed wW string escapes + in an unintended way. + Fix this by ignoring longflg and behave the way wW string esacpes + behaved with adding addtional L escape. (So %w is now what %Lw was before + all these changes. This should be a minor, acceptable change as it was + undocumented and it buys quite some code cleanup with it.). Patch is: + screen_fix_wW_string_escapes_to_nearly_old_behavior.patch + ------------------------------------------------------------------- Mon Feb 18 09:04:34 UTC 2013 - trenn@suse.de diff --git a/screen.spec b/screen.spec index b5f0099..7f1fb42 100644 --- a/screen.spec +++ b/screen.spec @@ -52,6 +52,7 @@ Patch10: screen-poll-zombies.patch Patch11: screen_enhance_windows_list_1_3.patch Patch12: screen_enhance_windows_list_2_3.patch Patch13: show_all_active.patch +Patch14: screen_fix_wW_string_escapes_to_nearly_old_behavior.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +78,7 @@ Documentation: man page %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ diff --git a/screen_fix_wW_string_escapes_to_nearly_old_behavior.patch b/screen_fix_wW_string_escapes_to_nearly_old_behavior.patch new file mode 100644 index 0000000..2370f77 --- /dev/null +++ b/screen_fix_wW_string_escapes_to_nearly_old_behavior.patch @@ -0,0 +1,19 @@ +From: Thomas Renninger +References: bnc#808565 +Subject: Fix old wW string escapes behavior to what previously was %Lw + +Signed-off-by: Thomas Renninger + +Index: screen-4.0.4/screen.c +=================================================================== +--- screen-4.0.4.orig/screen.c ++++ screen-4.0.4/screen.c +@@ -2780,7 +2780,7 @@ int rec; + oldfore = D_fore; + D_fore = win; + } +- ss = AddWindows(p, l - 1, (*s == 'w' ? 0 : 1) | (longflg ? 0 : 2) | (plusflg ? 4 : 0) | (minusflg ? 8 : 0), win ? win->w_number : -1); ++ ss = AddWindows(p, l - 1, (*s == 'w' ? 0 : 1) | (plusflg ? 4 : 0) | (minusflg ? 8 : 0), win ? win->w_number : -1); + if (display) + D_fore = oldfore; + }