mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3047_panel_dir_fix'

Browse Source 
* 3047_panel_dir_fix:
  Ticket #3047: fix mc arguments handling.
This commit is contained in:
Andrew Borodin 2013-09-13 18:04:37 +04:00
commit 5b1350c254
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/man/mc.1.in
View File

@ -172,11 +172,12 @@ screen modes, and able to send mouse escape sequences).
Do not use X11 to get the state of modifiers Alt, Ctrl, Shift
.PP
If both paths are specified, the first path name is the directory to show
in the left panel; the second path name is the directory to be shown in
the right panel.
in the active panel; the second path name is the directory to be shown in
the other panel.
.PP
If one path is specified, the path name is the directory to show
in the active panel; current directory is shown in the passive panel.
in the active panel; value of "other_dir" from panels.ini is the directory
to be shown in the passive panel.
.PP
If no paths are specified, current directory is shown in the active panel;
value of "other_dir" from panels.ini is the directory to be shown in

7
doc/man/ru/mc.1.in
View File

@ -149,13 +149,14 @@ modes, and able to send mouse escape sequences).
Не использовать X11 для получения состояния модификаторов Alt, Ctrl, Shift.
.PP
Если в командной строке указаны два каталога, первый будет отображаться
в левой панели, второй \- в правой.
в активной панели, второй \- в другой панели.
.PP
Если указан только один каталог, он будет отображён в активной панели,
во второй панели будет отображён текущий каталог.
во второй панели будет отображён каталог, указанный в параметре "other_dir"
в файле panels.ini.
.PP
Если каталоги не указаны, в активной панели будет отображён текущий каталог,
а во второй панели \- каталог, указанный в параметре "other_dir" в файла panels.ini.
а во второй панели \- каталог, указанный в параметре "other_dir" в файле panels.ini.
.\"NODE "Overview"
.SH "Главное окно программы"
Главное окно программы Midnight Commander состоит из трех полей. Два

22
src/filemanager/midnight.c
View File

@ -584,15 +584,15 @@ create_panels (void)
* Following cases from command line are possible:
* 'mc' (no arguments): mc_run_param0 == NULL, mc_run_param1 == NULL
* active panel uses current directory
* passive panel uses "other_dir" from ini
* passive panel uses "other_dir" from panels.ini
*
* 'mc dir1 dir2' (two arguments): mc_run_param0 != NULL, mc_run_param1 != NULL
* left panel uses mc_run_param0
* right panel uses mc_run_param1
* active panel uses mc_run_param0
* passive panel uses mc_run_param1
*
* 'mc dir1' (single argument): mc_run_param0 != NULL, mc_run_param1 == NULL
* active panel uses current directory
* passive panel uses mc_run_param0
* active panel uses mc_run_param0
* passive panel uses "other_dir" from panels.ini
*/
/* Set up panel directories */
@ -619,8 +619,8 @@ create_panels (void)
else /* mc_run_param0 != NULL && mc_run_param1 == NULL */
{
/* one argument */
current_dir = NULL; /* assume current dir */
other_dir = (char *) mc_run_param0;
current_dir = (char *) mc_run_param0;
other_dir = saved_other_dir; /* from ini */
}
}
else
@ -640,14 +640,14 @@ create_panels (void)
else if (mc_run_param0 != NULL && mc_run_param1 != NULL)
{
/* two arguments */
current_dir = mc_run_param1;
other_dir = (char *) mc_run_param0;
current_dir = (char *) mc_run_param0;
other_dir = mc_run_param1;
}
else /* mc_run_param0 != NULL && mc_run_param1 == NULL */
{
/* one argument */
current_dir = NULL; /* assume current dir */ ;
other_dir = (char *) mc_run_param0;
current_dir = (char *) mc_run_param0;
other_dir = saved_other_dir; /* from ini */
}
}