Bash-4.3 patch 41
This commit is contained in:
parent
8d98b94e3e
commit
2b3ca7e0cf
3 changed files with 16 additions and 1 deletions
13
bashline.c
13
bashline.c
|
|
@ -1468,10 +1468,23 @@ attempt_shell_completion (text, start, end)
|
||||||
|
|
||||||
os = start;
|
os = start;
|
||||||
n = 0;
|
n = 0;
|
||||||
|
was_assignment = 0;
|
||||||
s = find_cmd_start (os);
|
s = find_cmd_start (os);
|
||||||
e = find_cmd_end (end);
|
e = find_cmd_end (end);
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
/* Don't read past the end of rl_line_buffer */
|
||||||
|
if (s > rl_end)
|
||||||
|
{
|
||||||
|
s1 = s = e1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* Or past point if point is within an assignment statement */
|
||||||
|
else if (was_assignment && s > rl_point)
|
||||||
|
{
|
||||||
|
s1 = s = e1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
/* Skip over assignment statements preceding a command name. If we
|
/* Skip over assignment statements preceding a command name. If we
|
||||||
don't find a command name at all, we can perform command name
|
don't find a command name at all, we can perform command name
|
||||||
completion. If we find a partial command name, we should perform
|
completion. If we find a partial command name, we should perform
|
||||||
|
|
|
||||||
|
|
@ -689,6 +689,8 @@ printable_part (pathname)
|
||||||
|
|
||||||
if (temp == 0 || *temp == '\0')
|
if (temp == 0 || *temp == '\0')
|
||||||
return (pathname);
|
return (pathname);
|
||||||
|
else if (temp[1] == 0 && temp == pathname)
|
||||||
|
return (pathname);
|
||||||
/* If the basename is NULL, we might have a pathname like '/usr/src/'.
|
/* If the basename is NULL, we might have a pathname like '/usr/src/'.
|
||||||
Look for a previous slash and, if one is found, return the portion
|
Look for a previous slash and, if one is found, return the portion
|
||||||
following that slash. If there's no previous slash, just return the
|
following that slash. If there's no previous slash, just return the
|
||||||
|
|
|
||||||
|
|
@ -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 40
|
#define PATCHLEVEL 41
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue