* main.c (do_execute): Don't show prompt if the command is empty

and the subshell is not running.
* view.c (view_handle_key): Add support for Ctrl-O in the viewer.
Suggested by Walery Studennikov <despair@sama.ru>
This commit is contained in:
Pavel Roskin 2001-08-07 16:32:22 +00:00
parent 554d6cacad
commit 5c428dc7a3
3 changed files with 13 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2001-08-07 Pavel Roskin <proski@gnu.org>
* main.c (do_execute): Don't show prompt if the command is empty
and the subshell is not running.
* view.c (view_handle_key): Add support for Ctrl-O in the viewer.
Suggested by Walery Studennikov <despair@sama.ru>
2001-08-06 Pavel Roskin <proski@gnu.org>
* boxes.c (display_init): Associate correct help topic.

View File

@ -767,7 +767,7 @@ do_execute (const char *shell, const char *command, int flags)
#ifndef __os2__
unlink (control_file);
#endif
if (!use_subshell && !(flags & EXECUTE_INTERNAL)){
if (!use_subshell && !(flags & EXECUTE_INTERNAL && command)) {
printf ("%s%s%s\n", last_paused ? "\r\n":"", prompt, command);
last_paused = 0;
}

View File

@ -2282,6 +2282,11 @@ view_handle_key (WView *view, int c)
view_move_forward (view, vheight - 1);
return 1;
case XCTRL('o'):
view_other_cmd ();
return 1;
/* Unlike Ctrl-O, run a new shell if the subshell is not running. */
case '!':
exec_shell ();
return 1;