Author: blues Date: Wed Jul 27 18:45:15 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.6.1
---- Files affected:
SOURCES:
amc-1.diff (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/amc-1.diff
diff -u SOURCES/amc-1.diff:1.4 SOURCES/amc-1.diff:1.5
--- SOURCES/amc-1.diff:1.4 Mon Jun 13 15:12:44 2005
+++ SOURCES/amc-1.diff Wed Jul 27 20:45:10 2005
@@ -1,19 +1,17 @@
-diff -Naur mc-2003-01-24-21.orig/edit/editcmddef.h
mc-2003-01-24-21.patched/edit/editcmddef.h
---- mc-2003-01-24-21.orig/edit/editcmddef.h Tue Jan 22 06:07:21 2002
-+++ mc-2003-01-24-21.patched/edit/editcmddef.h Sat Jan 25 14:32:07 2003
-@@ -104,6 +104,8 @@
- #define CK_Check_Save_And_Quit 457
- #define CK_Maximize 458
-
-+#define CK_Toggle_Syntax 480
+--- ./edit/editcmddef.h.org 2005-07-27 19:42:42.000000000 +0200
++++ ./edit/editcmddef.h 2005-07-27 19:43:59.000000000 +0200
+@@ -108,6 +108,8 @@
+ #define CK_Check_Save_And_Quit 457
+ #define CK_Maximize 458
+
++#define CK_Toggle_Syntax 480
+
/* macro */
- #define CK_Begin_Record_Macro 501
- #define CK_End_Record_Macro 502
-diff -Naur mc-2003-01-24-21.orig/edit/edit.c
mc-2003-01-24-21.patched/edit/edit.c
---- mc-2003-01-24-21.orig/edit/edit.c Mon Dec 23 11:19:07 2002
-+++ mc-2003-01-24-21.patched/edit/edit.c Sat Jan 25 14:28:53 2003
-@@ -2485,6 +2485,11 @@
+ #define CK_Begin_Record_Macro 501
+ #define CK_End_Record_Macro 502
+--- ./edit/edit.c.org 2005-07-27 19:44:15.000000000 +0200
++++ ./edit/edit.c 2005-07-27 19:46:16.000000000 +0200
+@@ -2480,6 +2480,11 @@
edit_insert_file_cmd (edit);
break;
@@ -25,21 +23,49 @@
case CK_Find:
edit_search_cmd (edit, 0);
break;
-
---- ./edit/editkeys.c.amc 2005-06-10 12:20:55.784294320 +0200
-+++ ./edit/editkeys.c 2005-06-10 12:21:17.170043192 +0200
-@@ -95,6 +95,7 @@
-
+--- ./edit/editkeys.c.org 2005-07-27 19:46:52.000000000 +0200
++++ ./edit/editkeys.c 2005-07-27 19:47:24.000000000 +0200
+@@ -96,6 +96,7 @@
+
XCTRL ('k'), CK_Delete_To_Line_End,
XCTRL ('l'), CK_Refresh,
+ XCTRL ('s'), CK_Toggle_Syntax,
XCTRL ('o'), CK_Shell,
XCTRL ('u'), CK_Undo,
-
-diff -Naur mc-2003-01-24-21.orig/src/file.c mc-2003-01-24-21.patched/src/file.c
---- mc-2003-01-24-21.orig/src/file.c Thu Dec 26 21:10:39 2002
-+++ mc-2003-01-24-21.patched/src/file.c Sat Jan 25 16:11:43 2003
-@@ -107,6 +107,9 @@
+
+--- ./src/cmd.c.org 2005-07-27 19:56:07.000000000 +0200
++++ ./src/cmd.c 2005-07-27 19:53:15.000000000 +0200
+@@ -478,6 +478,7 @@
+ int i;
+ int c;
+ int dirflag = 0;
++ int fileflag = 1;
+
+ reg_exp = input_dialog (title, "", easy_patterns ? "*" : ".");
+ if (!reg_exp)
+@@ -494,8 +495,9 @@
+ dirflag = 1;
+ reg_exp_t++;
+ }
+- if (reg_exp_t[strlen (reg_exp_t) - 1] == PATH_SEP) {
++ if ((*reg_exp_t) && reg_exp_t [strlen(reg_exp_t) - 1] == PATH_SEP){
+ dirflag = 1;
++ fileflag = 0;
+ reg_exp_t[strlen (reg_exp_t) - 1] = 0;
+ }
+
+@@ -506,7 +508,7 @@
+ if (!dirflag)
+ continue;
+ } else {
+- if (dirflag)
++ if (!fileflag)
+ continue;
+ }
+ c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
+--- ./src/file.c.org 2005-07-27 19:57:03.000000000 +0200
++++ ./src/file.c 2005-07-27 19:58:29.000000000 +0200
+@@ -90,6 +90,9 @@
/* If on, default for "No" in delete operations */
int safe_delete = 0;
@@ -49,47 +75,46 @@
/* This is a hard link cache */
struct link {
struct link *next;
-@@ -2150,6 +2153,10 @@
- g_free (ctx->dest_mask);
- ctx->dest_mask = NULL;
- }
+@@ -2051,6 +2054,10 @@
+ g_free (dest);
+ g_free (ctx->dest_mask);
+ ctx->dest_mask = NULL;
+
+ if( (op_beep_when_finished==2) || (op_beep_when_finished==1) )
-+ SLtt_beep();
++ SLtt_beep();
+
#ifdef WITH_BACKGROUND
/* Let our parent know we are saying bye bye */
if (we_are_background) {
---- ./src/key.c.amc 2005-06-10 14:41:41.746312928 +0200
-+++ ./src/key.c 2005-06-10 14:33:45.022785920 +0200
-@@ -819,8 +819,21 @@
- c = KEY_F (c - '0');
- else if (c == ' ')
- c = ESC_CHAR;
+--- ./src/key.c.org 2005-07-27 19:58:57.000000000 +0200
++++ ./src/key.c 2005-07-27 20:02:11.000000000 +0200
+@@ -898,8 +898,21 @@
+ c = KEY_F (c - '0');
+ else if (c == ' ')
+ c = ESC_CHAR;
- else
- c = ALT(c);
-+ else {
-+ switch (c){
-+ case '!': c = KEY_F(11);break;
-+ case '@': c = KEY_F(12);break;
-+ case '#': c = KEY_F(13);break;
-+ case '$': c = KEY_F(14);break;
-+ case '%': c = KEY_F(15);break;
-+ case '^': c = KEY_F(16);break;
-+ case '&': c = KEY_F(17);break;
-+ case '*': c = KEY_F(18);break;
-+ case '(': c = KEY_F(19);break;
-+ case ')': c = KEY_F(20);break;
-+ default: c = ALT(c);break;
-+ }
-+ }
-
- pending_keys = seq_append = NULL;
- this = NULL;
-diff -Naur mc-2003-01-24-21.orig/src/main.c mc-2003-01-24-21.patched/src/main.c
---- mc-2003-01-24-21.orig/src/main.c Sat Jan 25 13:46:00 2003
-+++ mc-2003-01-24-21.patched/src/main.c Sat Jan 25 15:40:09 2003
-@@ -227,6 +227,12 @@
++ else {
++ switch (c){
++ case '!': c = KEY_F(11);break;
++ case '@': c = KEY_F(12);break;
++ case '#': c = KEY_F(13);break;
++ case '$': c = KEY_F(14);break;
++ case '%': c = KEY_F(15);break;
++ case '^': c = KEY_F(16);break;
++ case '&': c = KEY_F(17);break;
++ case '*': c = KEY_F(18);break;
++ case '(': c = KEY_F(19);break;
++ case ')': c = KEY_F(20);break;
++ default: c = ALT(c);break;
++ }
++ }
+
+ pending_keys = seq_append = NULL;
+ this = NULL;
+--- ./src/main.c.org 2005-07-27 20:02:36.000000000 +0200
++++ ./src/main.c 2005-07-27 20:09:55.000000000 +0200
+@@ -222,6 +222,12 @@
are tagged files */
int confirm_view_dir = 0;
@@ -102,36 +127,49 @@
/* This flag indicates if the pull down menus by default drop down */
int drop_menus = 0;
-@@ -462,6 +468,7 @@
+@@ -428,12 +434,13 @@
void
- do_possible_cd (char *new_dir)
+ do_possible_cd (const char *new_dir)
{
-+ if(!allow_subshell_chdir) return;
- if (!do_cd (new_dir, cd_exact))
- message (1, _("Warning"),
- _(" The Commander can't change to the directory that \n"
-@@ -867,8 +875,18 @@
+- if (!do_cd (new_dir, cd_exact))
+- message (1, _("Warning"),
+- _(" The Commander can't change to the directory that \n"
+- " the subshell claims you are in. Perhaps you have \n"
+- " deleted your working directory, or given yourself \n"
+- " extra access permissions with the \"su\" command? "));
++ if (!allow_subshell_chdir) return;
++ if (!do_cd (new_dir, cd_exact))
++ message (1, _("Warning"),
++ _(" The Commander can't change to the directory
that \n"
++ " the subshell claims you are in.
Perhaps you have \n"
++ " deleted your working directory, or
given yourself \n"
++ " extra access permissions with the
\"su\" command? "));
+ }
+
+ void
+@@ -704,9 +711,19 @@
if (current_dlg == midnight_dlg && command_prompt) {
int prompt_len;
- prompt = strip_ctrl_codes (subshell_prompt);
-- prompt_len = strlen (prompt);
+ if(command_prompt_type==0){
-+ prompt = (geteuid () == 0) ? "# " : "$ ";
++ prompt = (geteuid () == 0) ? "# " : "$ ";
+ } else
-+ if(command_prompt_type==1){
-+ prompt = current_panel->cwd;
-+ } else
-+ if(command_prompt_type==2){
-+ prompt = strip_ctrl_codes (subshell_prompt);
-+ } else
-+ prompt = "C:\\> ";
-+ prompt_len = strlen (prompt);
-+ if(command_prompt_type==1) ++prompt_len;
-
++ if(command_prompt_type==1) {
++ prompt = current_panel->cwd;
++ } else
++ if(command_prompt_type==2) {
++ prompt = strip_ctrl_codes (subshell_prompt);
++ } else
++ prompt = "C:\\> ";
+ prompt_len = strlen (prompt);
+-
++ if(command_prompt_type==1) ++prompt_len;
++
/* Check for prompts too big */
if (COLS > 8 && prompt_len > COLS - 8) {
-@@ -1027,7 +1045,7 @@
+ prompt[COLS - 8] = 0;
+@@ -866,7 +883,7 @@
{' ', N_("&Quick cd M-c"), 'Q', quick_cd_cmd},
{' ', "", ' ', 0},
{' ', N_("select &Group M-+"), 'G', select_cmd},
@@ -140,7 +178,7 @@
{' ', N_("reverse selec&Tion M-*"), 'T', reverse_selection_cmd},
{' ', "", ' ', 0},
{' ', N_("e&Xit F10"), 'X', quit_cmd}
-@@ -1479,6 +1497,7 @@
+@@ -1271,6 +1288,7 @@
/* To access the directory hotlist */
{XCTRL ('\\'), quick_chdir_cmd},
@@ -148,10 +186,20 @@
/* Suspend */
{XCTRL ('z'), suspend_cmd},
-diff -Naur mc-2003-01-24-21.orig/src/setup.c
mc-2003-01-24-21.patched/src/setup.c
---- mc-2003-01-24-21.orig/src/setup.c Sat Jan 25 13:46:00 2003
-+++ mc-2003-01-24-21.patched/src/setup.c Sat Jan 25 16:13:25 2003
-@@ -58,6 +58,11 @@
+--- ./src/screen.c.org 2005-07-27 20:10:16.000000000 +0200
++++ ./src/screen.c 2005-07-27 20:11:19.000000000 +0200
+@@ -2130,7 +2130,7 @@
+ { ALT('u'), directory_history_next },
+ { ALT('+'), cmd_select },
+ { KEY_KP_ADD, cmd_select },
+- { ALT('\\'), cmd_unselect },
++// { ALT('\\'), cmd_unselect },
+ { ALT('-'), cmd_unselect },
+ { KEY_KP_SUBTRACT, cmd_unselect },
+ { ALT('*'), cmd_reverse_selection },
+--- ./src/setup.c.org 2005-07-27 20:12:15.000000000 +0200
++++ ./src/setup.c 2005-07-27 20:32:01.000000000 +0200
+@@ -62,6 +62,11 @@
extern int num_history_items_recorded;
@@ -163,7 +211,7 @@
char *profile_name; /* .mc/ini */
char *global_profile_name; /* mc.lib */
-@@ -124,6 +129,7 @@
+@@ -128,6 +133,7 @@
{ "xterm_title", &xterm_title },
{ "output_lines", &output_lines },
{ "command_prompt", &command_prompt },
@@ -171,7 +219,7 @@
{ "menubar_visible", &menubar_visible },
{ "show_mini_info", &show_mini_info },
{ "permission_mode", &permission_mode },
-@@ -154,6 +160,7 @@
+@@ -159,6 +165,7 @@
{ "confirm_execute", &confirm_execute },
{ "confirm_exit", &confirm_exit },
{ "safe_delete", &safe_delete },
@@ -179,7 +227,7 @@
{ "mouse_repeat_rate", &mou_auto_repeat },
{ "double_click_speed", &double_click_speed },
#ifndef HAVE_CHARSET
-@@ -178,6 +185,8 @@
+@@ -183,6 +190,8 @@
{ "alternate_plus_minus", &alternate_plus_minus },
{ "only_leading_plus_minus", &only_leading_plus_minus },
{ "show_output_starts_shell", &output_starts_shell },
@@ -188,9 +236,19 @@
{ "panel_scroll_pages", &panel_scroll_pages },
{ "xtree_mode", &xtree_mode },
{ "num_history_items_recorded", &num_history_items_recorded },
---- ./src/subshell.c.org 2005-06-13 14:44:23.300855768 +0200
-+++ ./src/subshell.c 2005-06-13 14:59:04.423904704 +0200
-@@ -897,7 +897,7 @@
+--- ./src/subshell.c.org 2005-07-27 20:33:40.000000000 +0200
++++ ./src/subshell.c 2005-07-27 20:39:59.000000000 +0200
+@@ -91,6 +91,9 @@
+ TRUE;
+ #endif
+
++/* Don't allow ctrl+o (panels ON) if shell already dunning a command: */
++int subshell_blocks_ctrlo=1;
++
+ /* File descriptor of the pseudoterminal used by the subshell */
+ int subshell_pty = 0;
+
+@@ -894,7 +897,7 @@
fd_set read_set; /* For `select' */
int maxfdp;
int bytes; /* For the return value from `read' */
@@ -199,7 +257,7 @@
struct timeval wtime; /* Maximum time we wait for the subshell */
struct timeval *wptr;
-@@ -995,23 +995,34 @@
+@@ -992,14 +995,25 @@
exit (1);
}
@@ -211,12 +269,8 @@
- return TRUE;
- }
-
-- write (subshell_pty, pty_buffer, bytes);
-- subshell_ready = FALSE;
-- } else {
-- return FALSE;
-+ if(subshell_blocks_ctrlo){
-+ if (pty_buffer[0] == subshell_switch_key &&
subshell_ready==TRUE){
++ if(subshell_blocks_ctrlo) {
++ if (pty_buffer[0] == subshell_switch_key &&
subshell_ready==TRUE) {
+ subshell_state = INACTIVE;
+ return TRUE;
+ }
@@ -233,50 +287,7 @@
+ subshell_state = INACTIVE;
+ return TRUE;
+ }
-+
-+ write (subshell_pty, pty_buffer, bytes);
-+ subshell_ready = FALSE;
-+ } else {
-+ return FALSE;
+ }
- }
- }
- }
-
--
- /* Wait until the subshell dies or stops. If it stops, make it resume. */
- /* Possibly modifies the globals `subshell_alive' and `subshell_stopped' */
- static void synchronize (void)
---- ./src/cmd.c.org 2005-06-13 14:34:50.986860720 +0200
-+++ ./src/cmd.c 2005-06-13 14:48:59.394883096 +0200
-@@ -495,8 +495,9 @@
- dirflag = 1;
- reg_exp_t++;
- }
-- if (reg_exp_t[strlen (reg_exp_t) - 1] == PATH_SEP) {
-+ if ((*reg_exp_t) && reg_exp_t [strlen(reg_exp_t) - 1] == PATH_SEP){
- dirflag = 1;
-+ fileflag = 0;
- reg_exp_t[strlen (reg_exp_t) - 1] = 0;
- }
-
-@@ -507,7 +508,7 @@
- if (!dirflag)
- continue;
+ write (subshell_pty, pty_buffer, bytes);
+ subshell_ready = FALSE;
} else {
-- if (dirflag)
-+ if (!fileflag)
- continue;
- }
- c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
---- ./src/screen.c.org 2005-06-13 14:44:15.237081648 +0200
-+++ ./src/screen.c 2005-06-13 14:51:01.965249568 +0200
-@@ -2113,7 +2130,7 @@
- { ALT('u'), directory_history_next },
- { ALT('+'), cmd_select },
- { KEY_KP_ADD, cmd_select },
-- { ALT('\\'), cmd_unselect },
-+// { ALT('\\'), cmd_unselect },
- { ALT('-'), cmd_unselect },
- { KEY_KP_SUBTRACT, cmd_unselect },
- { ALT('*'), cmd_reverse_selection },
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/amc-1.diff?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
