Accepting request 616516 from Base:System

- Add patch readline-7.0-screen.patch to be able to parse settings
  in inputrc for all screen TERM variables starting with "screen."
  to fix boo#1095661

OBS-URL: https://build.opensuse.org/request/show/616516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/readline?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2018-06-27 08:13:42 +00:00 committed by Git OBS Bridge
commit 2e12959f0b
3 changed files with 34 additions and 0 deletions

25
readline-7.0-screen.patch Normal file
View File

@ -0,0 +1,25 @@
Special for screen and its new TERM setting like TERM=screen.xterm-256color
---
lib/readline/bind.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- lib/readline/bind.c
+++ lib/readline/bind.c 2018-06-13 11:30:47.908033945 +0000
@@ -1127,6 +1127,16 @@ parser_if (args)
`$if term=sun-cmd' into their .inputrc. */
_rl_parsing_conditionalized_out = _rl_stricmp (args + 5, tname) &&
_rl_stricmp (args + 5, rl_terminal_name);
+
+ if (!_rl_parsing_conditionalized_out && _rl_strnicmp (args + 5, "screen", 6))
+ {
+ tem = strchr (tname, '.');
+ if (tem)
+ *tem = '\0';
+
+ _rl_parsing_conditionalized_out = _rl_stricmp (args + 5, tname);
+ }
+
xfree (tname);
}
#if defined (VI_MODE)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 13 11:35:34 UTC 2018 - werner@suse.de
- Add patch readline-7.0-screen.patch to be able to parse settings
in inputrc for all screen TERM variables starting with "screen."
to fix boo#1095661
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 18 22:18:49 UTC 2018 - jengelh@inai.de Sun Mar 18 22:18:49 UTC 2018 - jengelh@inai.de

View File

@ -45,6 +45,7 @@ Patch4: readline-6.2-endpw.dif
Patch5: readline-6.2-xmalloc.dif Patch5: readline-6.2-xmalloc.dif
Patch6: readline-6.3-destdir.patch Patch6: readline-6.3-destdir.patch
Patch7: readline-6.3-rltrace.patch Patch7: readline-6.3-rltrace.patch
Patch8: readline-7.0-screen.patch
%{expand: %%global rl_major %(echo %{version} | sed -r 's/.[0-9]+//g')} %{expand: %%global rl_major %(echo %{version} | sed -r 's/.[0-9]+//g')}
%description %description
@ -117,6 +118,7 @@ done
%patch5 -p0 -b .xm %patch5 -p0 -b .xm
%patch6 -p0 -b .destdir %patch6 -p0 -b .destdir
%patch7 -p2 -b .tmp %patch7 -p2 -b .tmp
%patch8 -p2 -b .screen
%patch0 -p0 -b .0 %patch0 -p0 -b .0
%build %build