diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2008-11-18 13:15:12 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:59 +0000 |
| commit | f1be666c7d78939ad775078d290bec2758fa29a2 (patch) | |
| tree | 4f4b8ed6eb250653e0bb44685eb5ffa9d3805e91 /builtins/set.def | |
| parent | 0628567a28f3510f506ae46cb9b24b73a6d2dc5d (diff) | |
| download | bash-f1be666c7d78939ad775078d290bec2758fa29a2.tar.gz | |
Imported from ../bash-3.2.48.tar.gz.
Diffstat (limited to 'builtins/set.def')
| -rw-r--r-- | builtins/set.def | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/builtins/set.def b/builtins/set.def index d1086695..9d863191 100644 --- a/builtins/set.def +++ b/builtins/set.def @@ -189,7 +189,7 @@ struct { { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, #endif /* BANG_HISTORY */ #if defined (HISTORY) - { "history", '\0', &remember_on_history, bash_set_history, (setopt_get_func_t *)NULL }, + { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, #endif { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, @@ -381,13 +381,17 @@ bash_set_history (on_or_off, option_name) { if (on_or_off == FLAG_ON) { + enable_history_list = 1; bash_history_enable (); if (history_lines_this_session == 0) load_history (); } else - bash_history_disable (); - return (1 - remember_on_history); + { + enable_history_list = 0; + bash_history_disable (); + } + return (1 - enable_history_list); } #endif @@ -565,7 +569,7 @@ void reset_shell_options () { #if defined (HISTORY) - remember_on_history = 1; + remember_on_history = enable_history_list = 1; #endif ignoreeof = 0; } |