mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* main.c (mc_maybe_editor_or_viewer) [!USE_INTERNAL_EDIT]: 

Reenable to make "mc -v" possible.
(do_nc): Call mc_maybe_editor_or_viewer() even if the editor
is not compiled in.
(argument_table) [!USE_INTERNAL_EDIT]: Disable "-e".
This commit is contained in:
Pavel Roskin 2001-08-20 05:39:21 +00:00
parent ff8db34978
commit d56dd815b1
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2001-08-19 Pavel Roskin <proski@gnu.org>
* main.c (mc_maybe_editor_or_viewer) [!USE_INTERNAL_EDIT]:
Reenable to make "mc -v" possible.
(do_nc): Call mc_maybe_editor_or_viewer() even if the editor
is not compiled in.
(argument_table) [!USE_INTERNAL_EDIT]: Disable "-e".
2001-08-19 Andrew V. Samoilov <sav@bcs.zp.ua> 2001-08-19 Andrew V. Samoilov <sav@bcs.zp.ua>
* view.c (view_handle_key) [HAVE_CHARSET]: Remove unneeded * view.c (view_handle_key) [HAVE_CHARSET]: Remove unneeded

13
src/main.c
View File

@ -2212,12 +2212,10 @@ prepend_cwd_on_local (char *filename)
return g_strdup (filename); return g_strdup (filename);
} }
#ifdef USE_INTERNAL_EDIT
static int static int
mc_maybe_editor_or_viewer (void) mc_maybe_editor_or_viewer (void)
{ {
char *path; char *path = NULL;
if (!(view_one_file || edit_one_file)) if (!(view_one_file || edit_one_file))
return 0; return 0;
@ -2230,6 +2228,7 @@ mc_maybe_editor_or_viewer (void)
setup_dummy_mc (path); setup_dummy_mc (path);
view_file (path, 0, 1); view_file (path, 0, 1);
} }
#ifdef USE_INTERNAL_EDIT
else { else {
path = prepend_cwd_on_local (""); path = prepend_cwd_on_local ("");
#ifndef HAVE_GNOME #ifndef HAVE_GNOME
@ -2241,25 +2240,22 @@ mc_maybe_editor_or_viewer (void)
exit (1); exit (1);
#endif #endif
} }
#endif /* USE_INTERNAL_EDIT */
g_free (path); g_free (path);
midnight_shutdown = 1; midnight_shutdown = 1;
done_mc (); done_mc ();
return 1; return 1;
} }
#endif /* USE_INTERNAL_EDIT */
static void static void
do_nc (void) do_nc (void)
{ {
midnight_dlg = create_dlg (0, 0, LINES, COLS, midnight_colors, midnight_callback, "[main]", "midnight", 0); midnight_dlg = create_dlg (0, 0, LINES, COLS, midnight_colors, midnight_callback, "[main]", "midnight", 0);
midnight_dlg->has_menubar = 1; midnight_dlg->has_menubar = 1;
#ifdef USE_INTERNAL_EDIT
/* Check if we were invoked as an editor or file viewer */ /* Check if we were invoked as an editor or file viewer */
if (mc_maybe_editor_or_viewer ()) if (mc_maybe_editor_or_viewer ())
return; return;
#endif
setup_mc (); setup_mc ();
@ -2684,8 +2680,11 @@ static const struct poptOption argument_table [] = {
#ifdef HAVE_SUBSHELL_SUPPORT #ifdef HAVE_SUBSHELL_SUPPORT
{ "dbgsubshell", 'X', POPT_ARG_NONE, &debug_subshell, 0 }, { "dbgsubshell", 'X', POPT_ARG_NONE, &debug_subshell, 0 },
#endif #endif
#ifdef USE_INTERNAL_EDIT
{ "edit", 'e', POPT_ARG_STRING, &edit_one_file, 0, { "edit", 'e', POPT_ARG_STRING, &edit_one_file, 0,
N_("Edits one file") }, N_("Edits one file") },
#endif
#ifndef HAVE_GNOME #ifndef HAVE_GNOME
{ "help", 'h', POPT_ARG_NONE, NULL, 'h', { "help", 'h', POPT_ARG_NONE, NULL, 'h',