Author: blues Date: Mon Jun 13 13:12:49 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.6.1pre4
---- Files affected:
SOURCES:
amc-1.diff (1.3 -> 1.4) , amc-2.diff (1.2 -> 1.3) , mc-home_etc2.patch (1.2
-> 1.3) , mc-pld-developerfriendly.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/amc-1.diff
diff -u SOURCES/amc-1.diff:1.3 SOURCES/amc-1.diff:1.4
--- SOURCES/amc-1.diff:1.3 Fri Jun 10 15:19:53 2005
+++ SOURCES/amc-1.diff Mon Jun 13 15:12:44 2005
@@ -36,65 +36,6 @@
XCTRL ('o'), CK_Shell,
XCTRL ('u'), CK_Undo,
-diff -Naur mc-2003-01-24-21.orig/src/cmd.c mc-2003-01-24-21.patched/src/cmd.c
---- mc-2003-01-24-21.orig/src/cmd.c Sat Jan 25 13:46:00 2003
-+++ mc-2003-01-24-21.patched/src/cmd.c Sat Jan 25 14:49:05 2003
-@@ -515,6 +515,7 @@
- int i;
- int c;
- int dirflag = 0;
-+ int fileflag = 1;
-
- reg_exp = input_dialog (_(" Select "), "", easy_patterns ? "*" : ".");
- if (!reg_exp)
-@@ -527,8 +528,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;
- }
-
-@@ -539,7 +541,7 @@
- if (!dirflag)
- continue;
- } else {
-- if (dirflag)
-+ if (!fileflag)
- continue;
- }
- c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file);
-@@ -562,6 +564,7 @@
- int i;
- int c;
- int dirflag = 0;
-+ int fileflag = 1;
-
- reg_exp = input_dialog (_(" Unselect "),"", easy_patterns ? "*" : ".");
- if (!reg_exp)
-@@ -574,8 +577,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;
- }
- for (i = 0; i < cpanel->count; i++){
-@@ -585,7 +589,7 @@
- if (!dirflag)
- continue;
- } else {
-- if (dirflag)
-+ if (!fileflag)
- continue;
- }
- c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file);
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
@@ -207,18 +148,6 @@
/* Suspend */
{XCTRL ('z'), suspend_cmd},
-diff -Naur mc-2003-01-24-21.orig/src/screen.c
mc-2003-01-24-21.patched/src/screen.c
---- mc-2003-01-24-21.orig/src/screen.c Tue Jan 21 03:25:51 2003
-+++ mc-2003-01-24-21.patched/src/screen.c Sat Jan 25 15:45:50 2003
-@@ -2100,7 +2100,7 @@
- { ALT('u'), directory_history_next },
- { ALT('+'), select_cmd },
- { KEY_KP_ADD, select_cmd },
-- { ALT('\\'), unselect_cmd },
-+// { ALT('\\'), unselect_cmd },
- { ALT('-'), unselect_cmd },
- { KEY_KP_SUBTRACT, unselect_cmd },
- { ALT('*'), reverse_selection_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
@@ -259,59 +188,95 @@
{ "panel_scroll_pages", &panel_scroll_pages },
{ "xtree_mode", &xtree_mode },
{ "num_history_items_recorded", &num_history_items_recorded },
-diff -Naur mc-2003-01-24-21.orig/src/subshell.c
mc-2003-01-24-21.patched/src/subshell.c
---- mc-2003-01-24-21.orig/src/subshell.c Sat Jan 25 13:46:00 2003
-+++ mc-2003-01-24-21.patched/src/subshell.c Sat Jan 25 15:58:50 2003
-@@ -100,6 +100,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;
-
-@@ -937,7 +940,7 @@
- fd_set read_set; /* For `select' */
+--- ./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 @@
+ fd_set read_set; /* For `select' */
int maxfdp;
- int bytes; /* For the return value from `read' */
-- int i; /* Loop counter */
-+ int i,j; /* Loop counter */
-
- struct timeval wtime; /* Maximum time we wait for the subshell */
+ int bytes; /* For the return value from `read' */
+- int i; /* Loop counter */
++ int i,j; /* Loop counter */
+
+ struct timeval wtime; /* Maximum time we wait for the subshell */
struct timeval *wptr;
-@@ -1039,7 +1042,19 @@
- exit (1);
- }
-
-- for (i=0; i<bytes; ++i)
-+ if(subshell_blocks_ctrlo){
-+ if (pty_buffer[0] == subshell_switch_key &&
-+ subshell_ready==TRUE){
-+ subshell_state = INACTIVE;
-+ return TRUE;
-+ }
+@@ -995,23 +995,34 @@
+ exit (1);
+ }
+
+- for (i = 0; i < bytes; ++i)
+- if (pty_buffer[i] == subshell_switch_key) {
+- write (subshell_pty, pty_buffer, i);
+- if (subshell_ready)
+- subshell_state = INACTIVE;
+- 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){
++ subshell_state = INACTIVE;
++ return TRUE;
++ }
+ // remove ctrl+o codes from buffer:
+ for (i=0,j=0; i<bytes; ++i)
-+ if (pty_buffer[i] != subshell_switch_key)
-+ pty_buffer[j++]=pty_buffer[i];
++ if (pty_buffer[i] != subshell_switch_key)
++ pty_buffer[j++]=pty_buffer[i];
+ bytes=j;
-+ } else {
-+ for (i=0; i<bytes; ++i)
- if (pty_buffer[i] == subshell_switch_key)
- {
- write (subshell_pty, pty_buffer, i);
-@@ -1047,9 +1062,10 @@
- subshell_state = INACTIVE;
- return TRUE;
- }
++ } else {
++ for (i = 0; i < bytes; ++i)
++ if (pty_buffer[i] == subshell_switch_key) {
++ write (subshell_pty, pty_buffer, i);
++ if (subshell_ready)
++ subshell_state = INACTIVE;
++ return TRUE;
++ }
++
++ write (subshell_pty, pty_buffer, bytes);
++ subshell_ready = FALSE;
++ } else {
++ return FALSE;
++ }
+ }
+ }
+ }
+
-
-+ }
- write (subshell_pty, pty_buffer, bytes);
-- subshell_ready = FALSE;
-+ 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;
+ } 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 },
================================================================
Index: SOURCES/amc-2.diff
diff -u SOURCES/amc-2.diff:1.2 SOURCES/amc-2.diff:1.3
--- SOURCES/amc-2.diff:1.2 Sun Feb 16 13:09:30 2003
+++ SOURCES/amc-2.diff Mon Jun 13 15:12:44 2005
@@ -575,63 +575,6 @@
+###############################################################################
\ No newline at end of file
-diff -Naur mc-2003-01-24-21.patched/syntax/makefile.syntax
mc-2003-01-24-21.patch2/syntax/makefile.syntax
---- mc-2003-01-24-21.patched/syntax/makefile.syntax Sun Sep 29 22:32:16 2002
-+++ mc-2003-01-24-21.patch2/syntax/makefile.syntax Sat Jan 25 20:50:40 2003
-@@ -1,3 +1,4 @@
-+# modified by A'rpi/ESP-team <[EMAIL PROTECTED]>
-
- context default
- keyword $(*) yellow
-@@ -10,36 +11,36 @@
- keyword whole linestart ifeq magenta
- keyword whole linestart ifneq magenta
- keyword whole linestart else magenta
-- keyword linestart \t lightgray red
-+# keyword linestart \t lightgray red
- keyword whole .PHONY white
- keyword whole .NOEXPORT white
- keyword = white
- keyword : yellow
- keyword \\\n yellow
- # this handles strange cases like @something@@somethingelse@ properly
-- keyword whole @+@ brightmagenta black
-- keyword @+@ brightmagenta black
-+ keyword whole @+@ brightmagenta
-+ keyword @+@ brightmagenta
-
- context linestart # \n brown
-- spellcheck
-- keyword whole @+@ brightmagenta black
-- keyword @+@ brightmagenta black
-+ keyword whole @+@ brightmagenta
-+ keyword @+@ brightmagenta
-
- context exclusive = \n brightcyan
- keyword \\\n yellow
- keyword $(*) yellow
- keyword ${*} brightgreen
-- keyword linestart \t lightgray red
-- keyword whole @+@ brightmagenta black
-- keyword @+@ brightmagenta black
-+# keyword linestart \t lightgray red
-+ keyword whole @+@ brightmagenta
-+ keyword @+@ brightmagenta
-
- context exclusive linestart \t \n
- keyword \\\n yellow
- keyword $(*) yellow
- keyword ${*} brightgreen
-- keyword linestart \t lightgray red
-- keyword whole @+@ brightmagenta black
-- keyword @+@ brightmagenta black
-+# keyword linestart \t lightgray red
-+ keyword whole @+@ brightmagenta
-+ keyword @+@ brightmagenta
-
-+###############################################################################
-
-
diff -Naur mc-2003-01-24-21.patched/syntax/mhtml.syntax
mc-2003-01-24-21.patch2/syntax/mhtml.syntax
--- mc-2003-01-24-21.patched/syntax/mhtml.syntax Thu Jan 1 01:00:00 1970
+++ mc-2003-01-24-21.patch2/syntax/mhtml.syntax Fri Aug 6 05:07:50 1999
@@ -730,3 +673,63 @@
+ exit 0;;
+esac
+exit 1
+--- ./syntax/makefile.syntax.amc-2 2005-06-13 15:03:46.007097552 +0200
++++ ./syntax/makefile.syntax 2005-06-13 15:10:51.022485392 +0200
+@@ -1,3 +1,5 @@
++# modified by A'rpi/ESP-team <[EMAIL PROTECTED]>
++
+ context default
+ keyword $$ brightcyan
+ keyword $(*) yellow
+@@ -12,21 +14,20 @@
+ keyword whole linestart ifeq magenta
+ keyword whole linestart ifneq magenta
+ keyword whole linestart else magenta
+- keyword linestart \t lightgray red
++# keyword linestart \t lightgray red
+ keyword whole .PHONY white
+ keyword whole .NOEXPORT white
+ keyword = white
+ keyword : yellow
+ keyword \\\n yellow
+ # this handles strange cases like @something@@somethingelse@ properly
+- keyword whole @+@ brightmagenta black
+- keyword @+@ brightmagenta black
++ keyword whole @+@ brightmagenta
++ keyword @+@ brightmagenta
+
+ # comment
+ context linestart # \n brown
+- spellcheck
+- keyword whole @+@ brightmagenta black
+- keyword @+@ brightmagenta black
++ keyword whole @+@ brightmagenta
++ keyword @+@ brightmagenta
+
+ # right part of an assignment
+ context exclusive = \n brightcyan
+@@ -34,9 +35,9 @@
+ keyword $$ brightcyan
+ keyword $(*) yellow
+ keyword ${*} brightgreen
+- keyword linestart \t lightgray red
+- keyword whole @+@ brightmagenta black
+- keyword @+@ brightmagenta black
++# keyword linestart \t lightgray red
++ keyword whole @+@ brightmagenta
++ keyword @+@ brightmagenta
+
+ # shell code
+ context exclusive linestart \t \n
+@@ -44,6 +45,8 @@
+ keyword $$ brightcyan
+ keyword $(*) yellow
+ keyword ${*} brightgreen
+- keyword linestart \t lightgray red
+- keyword whole @+@ brightmagenta black
+- keyword @+@ brightmagenta black
++# keyword linestart \t lightgray red
++ keyword whole @+@ brightmagenta
++ keyword @+@ brightmagenta
++
++###############################################################################
================================================================
Index: SOURCES/mc-home_etc2.patch
diff -u SOURCES/mc-home_etc2.patch:1.2 SOURCES/mc-home_etc2.patch:1.3
--- SOURCES/mc-home_etc2.patch:1.2 Mon Jun 7 00:15:13 2004
+++ SOURCES/mc-home_etc2.patch Mon Jun 13 15:12:44 2005
@@ -73,175 +73,6 @@
.I $HOME/.mc/ini
.IP
User's own setup. If this file is present, the setup is loaded from
-diff -urN mc-4.6.1-pre1.org/edit/edit.c mc-4.6.1-pre1/edit/edit.c
---- mc-4.6.1-pre1.org/edit/edit.c 2004-06-06 23:19:35.761460880 +0200
-+++ mc-4.6.1-pre1/edit/edit.c 2004-06-06 23:20:01.398563448 +0200
-@@ -2682,7 +2682,7 @@
- int nomark;
- struct stat status;
- long start_mark, end_mark;
-- char *block_file = catstrs (home_dir, BLOCK_FILE, 0);
-+ char *block_file = catstrs (etc_dir, BLOCK_FILE, 0);
- int rc = 0;
-
- nomark = eval_marks (edit, &start_mark, &end_mark);
-diff -urN mc-4.6.1-pre1.org/edit/editcmd.c mc-4.6.1-pre1/edit/editcmd.c
---- mc-4.6.1-pre1.org/edit/editcmd.c 2004-06-06 23:19:35.730465592 +0200
-+++ mc-4.6.1-pre1/edit/editcmd.c 2004-06-06 23:20:01.417560560 +0200
-@@ -584,7 +584,7 @@
- {
- char *filename;
- int file;
-- filename = catstrs (home_dir, MACRO_FILE, 0);
-+ filename = catstrs (etc_dir, MACRO_FILE, 0);
- if ((file = open (filename, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP
| S_IROTH)) == -1)
- return 0;
- close (file);
-@@ -620,7 +620,7 @@
- if (saved_macros_loaded)
- if ((j = macro_exists (k)) < 0)
- return 0;
-- g = fopen (catstrs (home_dir, TEMP_FILE, 0), "w");
-+ g = fopen (catstrs (etc_dir, TEMP_FILE, 0), "w");
- if (!g) {
- /* This heads the delete macro error dialog box */
- edit_error_dialog (_(" Delete macro "),
-@@ -654,7 +654,7 @@
- }
- fclose (f);
- fclose (g);
-- if (rename (catstrs (home_dir, TEMP_FILE, 0), catstrs (home_dir,
MACRO_FILE, 0)) == -1) {
-+ if (rename (catstrs (etc_dir, TEMP_FILE, 0), catstrs (etc_dir,
MACRO_FILE, 0)) == -1) {
- /* This heads the delete macro error dialog box */
- edit_error_dialog (_(" Delete macro "),
- get_sys_error (_(" Cannot overwrite macro file ")));
-@@ -2185,7 +2185,7 @@
- /* copies a block to clipboard file */
- static int edit_save_block_to_clip_file (WEdit * edit, long start, long
finish)
- {
-- return edit_save_block (edit, catstrs (home_dir, CLIP_FILE, 0), start,
finish);
-+ return edit_save_block (edit, catstrs (etc_dir, CLIP_FILE, 0), start,
finish);
- }
-
-
-@@ -2222,7 +2222,7 @@
-
- void edit_paste_from_X_buf_cmd (WEdit * edit)
- {
-- edit_insert_file (edit, catstrs (home_dir, CLIP_FILE, 0));
-+ edit_insert_file (edit, catstrs (etc_dir, CLIP_FILE, 0));
- }
-
-
-@@ -2274,7 +2274,7 @@
- if (eval_marks (edit, &start_mark, &end_mark))
- return 1;
- exp =
-- edit_get_save_file (catstrs (home_dir, CLIP_FILE, 0),
-+ edit_get_save_file (catstrs (etc_dir, CLIP_FILE, 0),
- _(" Save Block "));
- edit_push_action (edit, KEY_PRESS + edit->start_display);
- if (exp) {
-@@ -2303,7 +2303,7 @@
- int
- edit_insert_file_cmd (WEdit *edit)
- {
-- char *exp = edit_get_load_file (catstrs (home_dir, CLIP_FILE, 0),
-+ char *exp = edit_get_load_file (catstrs (etc_dir, CLIP_FILE, 0),
- _(" Insert File "));
- edit_push_action (edit, KEY_PRESS + edit->start_display);
- if (exp) {
-@@ -2339,7 +2339,7 @@
- edit_error_dialog (_(" Sort block "), _(" You must first highlight a
block of text. "));
- return 0;
- }
-- edit_save_block (edit, catstrs (home_dir, BLOCK_FILE, 0), start_mark,
end_mark);
-+ edit_save_block (edit, catstrs (etc_dir, BLOCK_FILE, 0), start_mark,
end_mark);
-
- exp = old ? old : "";
-
-@@ -2352,7 +2352,7 @@
- g_free (old);
- old = exp;
-
-- e = system (catstrs (" sort ", exp, " ", home_dir, BLOCK_FILE, " > ",
home_dir, TEMP_FILE, 0));
-+ e = system (catstrs (" sort ", exp, " ", etc_dir, BLOCK_FILE, " > ",
etc_dir, TEMP_FILE, 0));
- if (e) {
- if (e == -1 || e == 127) {
- edit_error_dialog (_(" Sort "),
-@@ -2370,7 +2370,7 @@
-
- if (edit_block_delete_cmd (edit))
- return 1;
-- edit_insert_file (edit, catstrs (home_dir, TEMP_FILE, 0));
-+ edit_insert_file (edit, catstrs (etc_dir, TEMP_FILE, 0));
- return 0;
- }
-
-@@ -2423,8 +2423,8 @@
- char *quoted_name = NULL;
-
- o = catstrs (mc_home, shell_cmd, 0); /* original source script */
-- h = catstrs (home_dir, EDIT_DIR, shell_cmd, 0); /* home script */
-- b = catstrs (home_dir, BLOCK_FILE, 0); /* block file */
-+ h = catstrs (etc_dir, EDIT_DIR, shell_cmd, 0); /* home script */
-+ b = catstrs (etc_dir, BLOCK_FILE, 0); /* block file */
-
- if (!(script_home = fopen (h, "r"))) {
- if (!(script_home = fopen (h, "w"))) {
-@@ -2476,8 +2476,8 @@
- * $3 - file where error messages should be put
- * (for compatibility with old scripts).
- */
-- system (catstrs (" ", home_dir, EDIT_DIR, shell_cmd, " ", quoted_name,
-- " ", home_dir, BLOCK_FILE " /dev/null", NULL));
-+ system (catstrs (" ", etc_dir, EDIT_DIR, shell_cmd, " ", quoted_name,
-+ " ", etc_dir, BLOCK_FILE " /dev/null", NULL));
-
- } else {
- /*
-@@ -2485,7 +2485,7 @@
- * Arguments:
- * $1 - name of the edited file.
- */
-- system (catstrs (" ", home_dir, EDIT_DIR, shell_cmd, " ",
-+ system (catstrs (" ", etc_dir, EDIT_DIR, shell_cmd, " ",
- quoted_name, NULL));
- }
- g_free (quoted_name);
-diff -urN mc-4.6.1-pre1.org/edit/editwidget.c mc-4.6.1-pre1/edit/editwidget.c
---- mc-4.6.1-pre1.org/edit/editwidget.c 2004-06-06 23:19:35.769459664
+0200
-+++ mc-4.6.1-pre1/edit/editwidget.c 2004-06-06 23:20:01.421559952 +0200
-@@ -176,7 +176,7 @@
- sizeof (int));
- }
- if (!made_directory) {
-- mkdir (catstrs (home_dir, EDIT_DIR, 0), 0700);
-+ mkdir (catstrs (etc_dir, EDIT_DIR, 0), 0700);
- made_directory = 1;
- }
-
-diff -urN mc-4.6.1-pre1.org/edit/syntax.c mc-4.6.1-pre1/edit/syntax.c
---- mc-4.6.1-pre1.org/edit/syntax.c 2004-06-06 23:19:35.731465440 +0200
-+++ mc-4.6.1-pre1/edit/syntax.c 2004-06-06 23:20:01.430558584 +0200
-@@ -630,7 +630,7 @@
- return fopen (filename, "r");
-
- g_free (error_file_name);
-- error_file_name = g_strconcat (home_dir, EDIT_DIR PATH_SEP_STR,
-+ error_file_name = g_strconcat (etc_dir, EDIT_DIR PATH_SEP_STR,
- filename, NULL);
- f = fopen (error_file_name, "r");
- if (f)
-@@ -1092,7 +1092,7 @@
- if (!*edit->filename && !type)
- return;
- }
-- f = catstrs (home_dir, SYNTAX_FILE, 0);
-+ f = catstrs (etc_dir, SYNTAX_FILE, 0);
- r = edit_read_syntax_file (edit, names, f, edit ? edit->filename : 0,
- get_first_editor_line (edit), type);
- if (r == -1) {
diff -urN mc-4.6.1-pre1.org/man/pl/man1/mc.1 mc-4.6.1-pre1/man/pl/man1/mc.1
--- mc-4.6.1-pre1.org/man/pl/man1/mc.1 2004-06-06 23:19:36.088411176 +0200
+++ mc-4.6.1-pre1/man/pl/man1/mc.1 2004-06-06 23:20:01.437557520 +0200
@@ -391,17 +222,6 @@
if (!exist_file (extension_file)) {
g_free (extension_file);
check_stock_mc_ext:
-diff -urN mc-4.6.1-pre1.org/src/global.h mc-4.6.1-pre1/src/global.h
---- mc-4.6.1-pre1.org/src/global.h 2004-06-06 23:19:35.634480184 +0200
-+++ mc-4.6.1-pre1/src/global.h 2004-06-06 23:20:01.461553872 +0200
-@@ -157,6 +157,7 @@
- #include "vfsdummy.h"
- #endif
-
-+extern char *etc_dir;
- extern char *home_dir;
-
- #ifdef min
diff -urN mc-4.6.1-pre1.org/src/hotlist.c mc-4.6.1-pre1/src/hotlist.c
--- mc-4.6.1-pre1.org/src/hotlist.c 2004-06-06 23:19:35.661476080 +0200
+++ mc-4.6.1-pre1/src/hotlist.c 2004-06-06 23:20:01.470552504 +0200
@@ -427,15 +247,6 @@
/* The home directory */
char *home_dir;
-@@ -2090,7 +2093,7 @@
- do_mc_filename_rename (char *mc_dir, char *o_name, char *n_name)
- {
- char *full_o_name = concat_dir_and_file (home_dir, o_name);
-- char *full_n_name = g_strconcat (home_dir, MC_BASE, n_name, NULL);
-+ char *full_n_name = g_strconcat (etc_dir, MC_BASE, n_name, NULL);
- int move;
-
- move = 0 == rename (full_o_name, full_n_name);
@@ -2104,7 +2107,7 @@
{
struct stat s;
@@ -547,15 +358,6 @@
diff -urN mc-4.6.1-pre1.org/src/user.c mc-4.6.1-pre1/src/user.c
--- mc-4.6.1-pre1.org/src/user.c 2004-06-06 23:19:35.688471976 +0200
+++ mc-4.6.1-pre1/src/user.c 2004-06-06 23:20:01.500547944 +0200
-@@ -218,7 +218,7 @@
- case 'k': /* block file name */
- case 'b': /* block file name / strip extension */ {
- if (edit_widget) {
-- char *file = g_strconcat (home_dir, BLOCK_FILE, NULL);
-+ char *file = g_strconcat (etc_dir, BLOCK_FILE, NULL);
- fname = (*quote_func) (file, 0);
- g_free (file);
- return fname;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/amc-1.diff?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/amc-2.diff?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/mc-home_etc2.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/mc-pld-developerfriendly.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
