Mercurial > mxe-octave
annotate src/readline-0-001-upstream.patch @ 5759:cdcabd2311e1
readline: Add upstream patch.
* src/readline-0-001.patch: Add upstream patch (reformatted to apply in MXE):
ftp://ftp.gnu.org/pub/gnu/readline/readline-8.1-patches
* dist-files.mk: Include new file in list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 13 May 2021 11:22:34 +0200 |
parents | |
children | baeb0900fdf7 |
rev | line source |
---|---|
5759
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 READLINE PATCH REPORT |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 ===================== |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 Readline-Release: 8.1 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 Patch-ID: readline81-001 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 Bug-Reported-by: Tom Tromey <tom@tromey.com> |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 Bug-Reference-ID: <875z3u9fd0.fsf@tromey.com> |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2021-01/msg00009.html |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 Bug-Description: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 The code to check readline versions in an inputrc file had the sense of the |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 comparisons reversed. |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 diff -ur a/input.c b/input.c |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 --- a/bind.c 2020-10-26 10:03:14.000000000 -0400 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 +++ b/bind.c 2021-01-18 16:38:48.000000000 -0500 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 @@ -1235,5 +1235,5 @@ |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 else if (_rl_strnicmp (args, "version", 7) == 0) |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 { |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 - int rlversion, versionarg, op, previ, major, minor; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 + int rlversion, versionarg, op, previ, major, minor, opresult; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 _rl_parsing_conditionalized_out = 1; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 @@ -1295,22 +1295,23 @@ |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 { |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 case OP_EQ: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 - _rl_parsing_conditionalized_out = rlversion == versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 + opresult = rlversion == versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 case OP_NE: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 - _rl_parsing_conditionalized_out = rlversion != versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 + opresult = rlversion != versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 case OP_GT: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 - _rl_parsing_conditionalized_out = rlversion > versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 + opresult = rlversion > versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 case OP_GE: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 - _rl_parsing_conditionalized_out = rlversion >= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 + opresult = rlversion >= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 case OP_LT: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 - _rl_parsing_conditionalized_out = rlversion < versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 + opresult = rlversion < versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 case OP_LE: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 - _rl_parsing_conditionalized_out = rlversion <= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 + opresult = rlversion <= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 } |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 + _rl_parsing_conditionalized_out = 1 - opresult; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 } |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
55 /* Check to see if the first word in ARGS is the same as the |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
56 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
57 - _rl_parsing_conditionalized_out = rlversion > versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
58 + opresult = rlversion > versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
59 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
60 case OP_GE: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
61 - _rl_parsing_conditionalized_out = rlversion >= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
62 + opresult = rlversion >= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
63 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
64 case OP_LT: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
65 - _rl_parsing_conditionalized_out = rlversion < versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
66 + opresult = rlversion < versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
67 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
68 case OP_LE: |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
69 - _rl_parsing_conditionalized_out = rlversion <= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
70 + opresult = rlversion <= versionarg; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
71 break; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
72 } |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
73 + _rl_parsing_conditionalized_out = 1 - opresult; |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
74 } |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
75 /* Check to see if the first word in ARGS is the same as the |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
76 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
77 diff -ur a/patchlevel b/patchlevel |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
78 --- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
79 +++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
80 *************** |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
81 @@ -1,3 +1,3 @@ |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
82 # Do not edit -- exists only for use by patch |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
83 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
84 -0 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
85 +1 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
86 |