dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.3 patch 19

Browse source
This commit is contained in:
Chet Ramey 2014-08-01 15:30:33 -04:00
commit 9b86eb22c4
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
builtins/read.def
View file

@ -442,7 +442,10 @@ read_builtin (list)
add_unwind_protect (reset_alarm, (char *)NULL); add_unwind_protect (reset_alarm, (char *)NULL);
#if defined (READLINE) #if defined (READLINE)
if (edit) if (edit)
{
add_unwind_protect (reset_attempted_completion_function, (char *)NULL); add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
add_unwind_protect (bashline_reset_event_hook, (char *)NULL);
}
#endif #endif
falarm (tmsec, tmusec); falarm (tmsec, tmusec);
} }
@ -1021,6 +1024,7 @@ edit_line (p, itext)
old_attempted_completion_function = rl_attempted_completion_function; old_attempted_completion_function = rl_attempted_completion_function;
rl_attempted_completion_function = (rl_completion_func_t *)NULL; rl_attempted_completion_function = (rl_completion_func_t *)NULL;
bashline_set_event_hook ();
if (itext) if (itext)
{ {
old_startup_hook = rl_startup_hook; old_startup_hook = rl_startup_hook;
@ -1032,6 +1036,7 @@ edit_line (p, itext)
rl_attempted_completion_function = old_attempted_completion_function; rl_attempted_completion_function = old_attempted_completion_function;
old_attempted_completion_function = (rl_completion_func_t *)NULL; old_attempted_completion_function = (rl_completion_func_t *)NULL;
bashline_reset_event_hook ();
if (ret == 0) if (ret == 0)
return ret; return ret;

8
lib/readline/input.c
View file

@ -534,8 +534,16 @@ rl_getc (stream)
return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
/* keyboard-generated signals of interest */
else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
RL_CHECK_SIGNALS (); RL_CHECK_SIGNALS ();
/* non-keyboard-generated signals of interest */
else if (_rl_caught_signal == SIGALRM
#if defined (SIGVTALRM)
|| _rl_caught_signal == SIGVTALRM
#endif
)
RL_CHECK_SIGNALS ();
if (rl_signal_event_hook) if (rl_signal_event_hook)
(*rl_signal_event_hook) (); (*rl_signal_event_hook) ();

2
patchlevel.h
View file

@ -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 18 #define PATCHLEVEL 19
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */