Mercurial > mxe-octave

annotate src/readline-0-001-upstream.patch @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents baeb0900fdf7
children 5ef7d51c2195
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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;
5760
baeb0900fdf7 readline: Remove redundant hunk from patch.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5759
diff changeset
23 + int rlversion, versionarg, op, previ, major, minor, opresult;
5759
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 diff -ur a/patchlevel b/patchlevel
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 --- 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
59 +++ 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
60 ***************
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 @@ -1,3 +1,3 @@
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 # Do not edit -- exists only for use by patch
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64 -0
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
65 +1
cdcabd2311e1 readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
66