Mercurial > mxe-octave

annotate src/readline-0-010-fix-issue-where-comparing-quot.patch @ 7241:770315229178 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SUNDIALS: Update to 7.0.0 * src/sundials-ida.mk: Update version and checksum. Update configuration flags. * src/sundials-ida-1-avoid-pointer-cast-of-array.patch: Rebase patch from upstream to avoid issue with pointer cast. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 05 Jun 2024 08:06:32 +0200
parents 142471155843
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7042
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From 5d4d92f221d6aac4be445bdd8cd9b48d9ac33f04 Mon Sep 17 00:00:00 2001
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Chet Ramey <chet.ramey@case.edu>
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Sun, 14 Jan 2024 15:22:07 -0500
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH 10/10] Readline-8.2 patch 10: fix issue where comparing quoted
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 and unquoted words to be completed results in readline not displaying
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 possible matches
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 ---
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 complete.c | 18 +++++++++++++++++-
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 patchlevel | 2 +-
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 2 files changed, 18 insertions(+), 2 deletions(-)
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 diff --git a/complete.c b/complete.c
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 index c9e0098..70a0a60 100644
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 --- a/complete.c
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 +++ b/complete.c
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 @@ -2031,9 +2031,25 @@ rl_complete_internal (int what_to_do)
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 text = rl_copy_text (start, end);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 + /* If TEXT contains quote characters, it will be dequoted as part of
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 + generating the matches, and the matches will not contain any quote
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 + characters. We need to dequote TEXT before performing the comparison.
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 + Since compare_match performs the dequoting, and we only want to do it
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 + once, we don't call compare_matches after dequoting TEXT; we call
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 + strcmp directly. */
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 /* nontrivial_lcd is set if the common prefix adds something to the word
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 being completed. */
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 - nontrivial_lcd = matches && compare_match (text, matches[0]) != 0;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 + if (rl_filename_completion_desired && rl_filename_quoting_desired &&
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 + rl_completion_found_quote && rl_filename_dequoting_function)
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 + {
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 + char *t;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 + t = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 + xfree (text);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 + text = t;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 + nontrivial_lcd = matches && strcmp (text, matches[0]) != 0;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 + }
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 + else
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 + nontrivial_lcd = matches && strcmp (text, matches[0]) != 0;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 if (what_to_do == '!' || what_to_do == '@')
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 tlen = strlen (text);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 xfree (text);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 diff --git a/patchlevel b/patchlevel
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 index c0ac809..810c277 100644
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 --- a/patchlevel
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 +++ b/patchlevel
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 @@ -1,3 +1,3 @@
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 # Do not edit -- exists only for use by patch
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 -9
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 +10
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 --
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 2.38.0.windows.1
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55