Mercurial > mxe-octave

annotate src/readline-0-009-fix-issue-where-directory-name-.patch @ 7243:ae230ac322f7 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/sqlite.mk: update to v3460000
author John Donoghue <john.donoghue@ieee.org>
date Wed, 05 Jun 2024 10:26:58 -0400
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 3853739c28a9777d30ff65e8448e8f1a2898f3f2 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:20:44 -0500
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH 09/10] Readline-8.2 patch 9: fix issue where directory name
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 being completed needs both tilde expansion and dequoting
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6
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 complete.c | 14 ++++++++++----
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 patchlevel | 2 +-
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 2 files changed, 11 insertions(+), 5 deletions(-)
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 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
13 index e5d224e..c9e0098 100644
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/complete.c
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/complete.c
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 @@ -2526,7 +2526,8 @@ rl_filename_completion_function (const char *text, int state)
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 temp = tilde_expand (dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 xfree (dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 dirname = temp;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - tilde_dirname = 1;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 + if (*dirname != '~')
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 + tilde_dirname = 1; /* indicate successful tilde expansion */
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 }
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 /* We have saved the possibly-dequoted version of the directory name
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 @@ -2545,11 +2546,16 @@ rl_filename_completion_function (const char *text, int state)
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 xfree (users_dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 users_dirname = savestring (dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 }
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 - else if (tilde_dirname == 0 && 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
31 + else if (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 - /* delete single and double quotes */
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 + /* We already ran users_dirname through the dequoting function.
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 + If tilde_dirname == 1, we successfully performed tilde expansion
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 + on dirname. Now we need to reconcile those results. We either
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 + just copy the already-dequoted users_dirname or tilde expand it
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 + if we tilde-expanded dirname. */
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 + temp = tilde_dirname ? tilde_expand (users_dirname) : savestring (users_dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 xfree (dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 - dirname = savestring (users_dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 + dirname = temp;
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 }
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 directory = opendir (dirname);
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 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
47 index 6c10f12..c0ac809 100644
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 --- a/patchlevel
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 +++ b/patchlevel
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 @@ -1,3 +1,3 @@
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 # 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
52
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 -8
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 +9
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 --
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 2.38.0.windows.1
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57