From e3698948a44e3d24bf6d331c0c87d038bec7c904 Mon Sep 17 00:00:00 2001 From: "Andrew V. Samoilov" Date: Sun, 12 Sep 2004 10:52:17 +0000 Subject: [PATCH] * execute.c (toggle_panels): Fix error. show_output_starts_shell=1 is not working * cmd.c (view_other_cmd): Likewise. --- src/ChangeLog | 8 ++++++++ src/cmd.c | 2 +- src/execute.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index bf34476f3..bb50a8bca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2004-09-12 Pavel Shirshov + + * execute.c (toggle_panels): Fix error. show_output_starts_shell=1 + is not working + * cmd.c (view_other_cmd): Likewise. + + From Petr Hadraba + 2004-09-10 Jakub Jelinek * view.c (get_byte): Fix avoid dying if file is too large diff --git a/src/cmd.c b/src/cmd.c index 6b168b220..ed58974ff 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -919,7 +919,7 @@ view_other_cmd (void) { static int message_flag = TRUE; - if (!xterm_flag && !console_flag && !use_subshell) { + if (!xterm_flag && !console_flag && !use_subshell && !output_starts_shell) { if (message_flag) message (1, MSG_ERROR, _(" Not an xterm or Linux console; \n" diff --git a/src/execute.c b/src/execute.c index 294ce19c9..eb710a9ad 100644 --- a/src/execute.c +++ b/src/execute.c @@ -235,7 +235,7 @@ toggle_panels (void) _("Type `exit' to return to the Midnight Commander")); fprintf (stderr, "\n\r\n\r"); - my_system (EXECUTE_AS_SHELL, shell, NULL); + my_system (EXECUTE_INTERNAL, shell, NULL); } else get_key_code (0); }