changeset 5760:baeb0900fdf7

readline: Remove redundant hunk from patch. * src/readline-0-001-upstream.patch: Remove accidentally duplicated hunk from patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 13 May 2021 17:23:00 +0200
parents cdcabd2311e1
children c366dab2350c
files src/readline-0-001-upstream.patch
diffstat 1 files changed, 1 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/readline-0-001-upstream.patch	Thu May 13 11:22:34 2021 +0200
+++ b/src/readline-0-001-upstream.patch	Thu May 13 17:23:00 2021 +0200
@@ -20,7 +20,7 @@
    else if (_rl_strnicmp (args, "version", 7) == 0)
      {
 -      int rlversion, versionarg, op, previ, major, minor;
-+       int rlversion, versionarg, op, previ, major, minor, opresult;
++      int rlversion, versionarg, op, previ, major, minor, opresult;
  
        _rl_parsing_conditionalized_out = 1;
 @@ -1295,22 +1295,23 @@
@@ -54,26 +54,6 @@
      }
    /* Check to see if the first word in ARGS is the same as the
 
-- 	  _rl_parsing_conditionalized_out = rlversion > versionarg;
-+ 	  opresult = rlversion > versionarg;
-  	  break;
-  	case OP_GE:
-- 	  _rl_parsing_conditionalized_out = rlversion >= versionarg;
-+ 	  opresult = rlversion >= versionarg;
-  	  break;
-  	case OP_LT:
-- 	  _rl_parsing_conditionalized_out = rlversion < versionarg;
-+ 	  opresult = rlversion < versionarg;
-  	  break;
-  	case OP_LE:
-- 	  _rl_parsing_conditionalized_out = rlversion <= versionarg;
-+ 	  opresult = rlversion <= versionarg;
-  	  break;
-  	}
-+      _rl_parsing_conditionalized_out = 1 - opresult;
-      }
-    /* Check to see if the first word in ARGS is the same as the
-
 diff -ur a/patchlevel b/patchlevel
 --- a/patchlevel	2013-11-15 08:11:11.000000000 -0500
 +++ b/patchlevel	2014-03-21 08:28:40.000000000 -0400