Accepting request 640076 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/640076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/readline?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2018-10-11 09:36:23 +00:00 committed by Git OBS Bridge
commit b00678362a
3 changed files with 15 additions and 11 deletions

View File

@ -1,23 +1,22 @@
Special for screen and its new TERM setting like TERM=screen.xterm-256color
---
lib/readline/bind.c | 10 ++++++++++
1 file changed, 10 insertions(+)
readline-7.0/bind.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- lib/readline/bind.c
+++ lib/readline/bind.c 2018-06-13 11:30:47.908033945 +0000
@@ -1127,6 +1127,16 @@ parser_if (args)
+++ readline-7.0/bind.c 2018-09-28 11:22:31.001503017 +0000
@@ -1127,6 +1127,15 @@ 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))
+ /* Skip the prefix `screen.' if any to use the underlying bindings */
+ if (_rl_parsing_conditionalized_out &&
+ _rl_strnicmp (rl_terminal_name, "screen.", 7) == 0)
+ {
+ tem = strchr (tname, '.');
+ if (tem)
+ *tem = '\0';
+
+ _rl_parsing_conditionalized_out = _rl_stricmp (args + 5, tname);
+ _rl_parsing_conditionalized_out = _rl_stricmp (args + 5, tname + 7) &&
+ _rl_stricmp (args + 5, rl_terminal_name + 7);
+ }
+
xfree (tname);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 28 11:29:32 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Rework patch readline-7.0-screen.patch
-------------------------------------------------------------------
Wed Jun 13 11:35:34 UTC 2018 - werner@suse.de

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#