summaryrefslogtreecommitdiff
path: root/builtins
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-08-01 15:30:33 -0400
committerChet Ramey <chet.ramey@case.edu>2014-08-01 15:30:33 -0400
commit9b86eb22c434c8848c9d592cba32d7e8fdf61459 (patch)
tree6e2f57d27aebaaafbc3b5692661159cc2b066b38 /builtins
parent35751626eebdec08c6ac8600b33477e6db31988a (diff)
downloadbash-9b86eb22c434c8848c9d592cba32d7e8fdf61459.tar.gz
Bash-4.3 patch 19
Diffstat (limited to 'builtins')
-rw-r--r--builtins/read.def7
1 files changed, 6 insertions, 1 deletions
diff --git a/builtins/read.def b/builtins/read.def
index 56945b95..43971544 100644
--- a/builtins/read.def
+++ b/builtins/read.def
@@ -442,7 +442,10 @@ read_builtin (list)
add_unwind_protect (reset_alarm, (char *)NULL);
#if defined (READLINE)
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
falarm (tmsec, tmusec);
}
@@ -1021,6 +1024,7 @@ edit_line (p, itext)
old_attempted_completion_function = rl_attempted_completion_function;
rl_attempted_completion_function = (rl_completion_func_t *)NULL;
+ bashline_set_event_hook ();
if (itext)
{
old_startup_hook = rl_startup_hook;
@@ -1032,6 +1036,7 @@ edit_line (p, itext)
rl_attempted_completion_function = old_attempted_completion_function;
old_attempted_completion_function = (rl_completion_func_t *)NULL;
+ bashline_reset_event_hook ();
if (ret == 0)
return ret;