Bash-4.3 patch 15
This commit is contained in:
parent
3b34f6e68c
commit
c6dcdf4d7a
2 changed files with 10 additions and 3 deletions
11
bashline.c
11
bashline.c
|
|
@ -4167,9 +4167,16 @@ bash_directory_completion_matches (text)
|
||||||
int qc;
|
int qc;
|
||||||
|
|
||||||
qc = rl_dispatching ? rl_completion_quote_character : 0;
|
qc = rl_dispatching ? rl_completion_quote_character : 0;
|
||||||
dfn = bash_dequote_filename ((char *)text, qc);
|
/* If rl_completion_found_quote != 0, rl_completion_matches will call the
|
||||||
|
filename dequoting function, causing the directory name to be dequoted
|
||||||
|
twice. */
|
||||||
|
if (rl_dispatching && rl_completion_found_quote == 0)
|
||||||
|
dfn = bash_dequote_filename ((char *)text, qc);
|
||||||
|
else
|
||||||
|
dfn = (char *)text;
|
||||||
m1 = rl_completion_matches (dfn, rl_filename_completion_function);
|
m1 = rl_completion_matches (dfn, rl_filename_completion_function);
|
||||||
free (dfn);
|
if (dfn != text)
|
||||||
|
free (dfn);
|
||||||
|
|
||||||
if (m1 == 0 || m1[0] == 0)
|
if (m1 == 0 || m1[0] == 0)
|
||||||
return m1;
|
return m1;
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,6 @@
|
||||||
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
||||||
looks for to find the patch level (for the sccs version string). */
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
#define PATCHLEVEL 14
|
#define PATCHLEVEL 15
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue