[Pkg-mc-commits] r144 - trunk/debian/patches/utf8
winnie at alioth.debian.org
winnie at alioth.debian.org
Mon Jun 9 16:04:43 UTC 2008
Author: winnie
Date: 2008-06-09 16:04:43 +0000 (Mon, 09 Jun 2008)
New Revision: 144
Modified:
trunk/debian/patches/utf8/recode.patch
Log:
Refreshed recode patch to make it apply
Modified: trunk/debian/patches/utf8/recode.patch
===================================================================
--- trunk/debian/patches/utf8/recode.patch 2008-06-09 15:59:59 UTC (rev 143)
+++ trunk/debian/patches/utf8/recode.patch 2008-06-09 16:04:43 UTC (rev 144)
@@ -1,7 +1,8 @@
-diff -Nurwd mc-4.6.2~pre1.orig/edit/editcmd.c mc-4.6.2~pre1/edit/editcmd.c
---- mc-4.6.2~pre1.orig/edit/editcmd.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/edit/editcmd.c 2008-02-13 21:02:16.000000000 +0100
-@@ -3321,7 +3321,7 @@
+Index: mc-4.6.2~git20080311/edit/editcmd.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/edit/editcmd.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/edit/editcmd.c 2008-06-09 18:00:33.000000000 +0200
+@@ -3323,7 +3323,7 @@
edit_select_codepage_cmd (WEdit *edit)
{
#ifdef HAVE_CHARSET
@@ -10,50 +11,41 @@
edit->force = REDRAW_COMPLETELY;
edit_refresh_cmd (edit);
#endif
-diff -Nurwd mc-4.6.2~pre1.orig/po/ru.po mc-4.6.2~pre1/po/ru.po
---- mc-4.6.2~pre1.orig/po/ru.po 2007-09-11 16:35:10.000000000 +0200
-+++ mc-4.6.2~pre1/po/ru.po 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/po/ru.po
+===================================================================
+--- mc-4.6.2~git20080311.orig/po/ru.po 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/po/ru.po 2008-06-09 18:02:26.000000000 +0200
@@ -17,7 +17,7 @@
"Project-Id-Version: ru\n"
- "Report-Msgid-Bugs-To: mc-devel at gnome.org\n"
- "POT-Creation-Date: 2007-09-11 17:35+0300\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2005-10-03 22:24-0400\n"
-"PO-Revision-Date: 2005-09-09 14:37+0300\n"
-+"PO-Revision-Date: 2008-02-12 21:13+0100\n"
++"PO-Revision-Date: 2008-06-09 18:02+0200\n"
"Last-Translator: Anton S. Chumak <nightfast at yahoo.co.uk>\n"
"Language-Team: Russian ru at li.org\n"
"MIME-Version: 1.0\n"
-@@ -3625,23 +3625,31 @@
+@@ -3624,5 +3624,30 @@
msgid "Changes to file lost"
msgstr "éÚÍÅÎÅÎÉÑ ÄÌÑ ÆÁÊÌÁ ÐÏÔÅÒÑÎÙ"
--#~ msgid "&Type"
--#~ msgstr "&ôÉÐ"
+-#~ msgid "%s bytes in %d files"
+-#~ msgstr "%s ÂÁÊÔ × %d ÆÁÊÌÁÈ"
+#: messages for recode patch
+msgid "Panel &codepage"
+msgstr "ëÏÄÉÒÏ×ËÁ ÐÁÎÅÌÉ"
-
--#~ msgid "&Links"
--#~ msgstr "&óÓÙÌËÉ"
++
+msgid " Choose codepage "
+msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ"
-
--#~ msgid "N&GID"
--#~ msgstr "N&GID"
++
+msgid " Choose panel codepage "
+msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ ÐÁÎÅÌÉ "
-
--#~ msgid "N&UID"
--#~ msgstr "N&UID"
++
+msgid " Choose default FTP codepage "
+msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ FTP ÐÏ ÕÍÏÌÞÁÎÉÀ "
-
--#~ msgid "&Owner"
--#~ msgstr "&÷ÌÁÄÅÌÅÃ"
++
+msgid "FTP default codepage:"
+msgstr "ëÏÄÉÒÏ×ËÁ FTP ÐÏ ÕÍÏÌÞÁÎÉÀ:"
-
--#~ msgid "&Group"
--#~ msgstr "&çÒÕÐÐÁ"
++
+msgid "Recode file names:"
+msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÔØ ÉÍÅÎÁ:"
+
@@ -65,13 +57,11 @@
+
+msgid " Choose \"TO\" codepage for COPY/MOVE operaion "
+msgstr" ÷ÙÂÅÒÉÔÅ ËÏÎÅÞÎÕÀ ËÏÄÉÒÏ×ËÕ ÄÌÑ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ/ÐÅÒÅÍÅÝÅÎÉÑ "
-
--#~ msgid "%s bytes in %d files"
--#~ msgstr "%s ÂÁÊÔ × %d ÆÁÊÌÁÈ"
-diff -Nurwd mc-4.6.2~pre1.orig/src/boxes.c mc-4.6.2~pre1/src/boxes.c
---- mc-4.6.2~pre1.orig/src/boxes.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/src/boxes.c 2008-02-13 21:01:06.000000000 +0100
-@@ -52,6 +52,7 @@
+Index: mc-4.6.2~git20080311/src/boxes.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/boxes.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/boxes.c 2008-06-09 18:00:33.000000000 +0200
+@@ -53,6 +53,7 @@
#ifdef HAVE_CHARSET
#include "charsets.h"
#include "selcodepage.h"
@@ -79,7 +69,7 @@
#endif
#ifdef USE_NETCODE
-@@ -454,8 +455,8 @@
+@@ -455,8 +456,8 @@
}
}
@@ -90,7 +80,7 @@
#ifndef HAVE_CHARSET
-@@ -551,23 +552,58 @@
+@@ -552,23 +553,58 @@
static int new_display_codepage;
@@ -153,7 +143,7 @@
return 0;
}
-@@ -589,9 +625,6 @@
+@@ -590,9 +626,6 @@
cpname = (new_display_codepage < 0)
? _("Other 8 bit")
: codepages[new_display_codepage].name;
@@ -163,7 +153,7 @@
add_widget (dbits_dlg,
button_new (DISPY - 3, DISPX / 2 + 3, B_CANCEL,
NORMAL_BUTTON, _("&Cancel"), 0));
-@@ -600,13 +633,30 @@
+@@ -601,13 +634,30 @@
0));
inpcheck =
@@ -199,7 +189,7 @@
return dbits_dlg;
}
-@@ -616,6 +666,7 @@
+@@ -617,6 +667,7 @@
{
Dlg_head *dbits_dlg;
new_display_codepage = display_codepage;
@@ -207,7 +197,7 @@
application_keypad_mode ();
dbits_dlg = init_disp_bits_box ();
-@@ -636,6 +687,17 @@
+@@ -637,6 +688,17 @@
&& display_codepage != 1) ? 128 : 160;
#endif
use_8th_bit_as_meta = !(inpcheck->state & C_BOOL);
@@ -225,9 +215,10 @@
}
destroy_dlg (dbits_dlg);
repaint_screen ();
-diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.c mc-4.6.2~pre1/src/charsets.c
---- mc-4.6.2~pre1.orig/src/charsets.c 2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.2~pre1/src/charsets.c 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/charsets.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/charsets.c 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/charsets.c 2008-06-09 18:00:33.000000000 +0200
@@ -121,8 +121,6 @@
}
}
@@ -246,9 +237,10 @@
translate_character (iconv_t cd, char c)
{
char outbuf[4], *obuf;
-diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.h mc-4.6.2~pre1/src/charsets.h
---- mc-4.6.2~pre1.orig/src/charsets.h 2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.2~pre1/src/charsets.h 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/charsets.h
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/charsets.h 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/charsets.h 2008-06-09 18:00:33.000000000 +0200
@@ -6,6 +6,7 @@
#define UNKNCHAR '\001'
@@ -268,9 +260,10 @@
const char *get_codepage_id (int n);
int get_codepage_index (const char *id);
int load_codepages_list (void);
-diff -Nurwd mc-4.6.2~pre1.orig/src/cmd.c mc-4.6.2~pre1/src/cmd.c
---- mc-4.6.2~pre1.orig/src/cmd.c 2007-05-02 14:01:13.000000000 +0200
-+++ mc-4.6.2~pre1/src/cmd.c 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/cmd.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/cmd.c 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/cmd.c 2008-06-09 18:00:33.000000000 +0200
@@ -70,6 +70,10 @@
# include "../edit/edit.h"
#endif
@@ -310,10 +303,11 @@
save_cwds_stat ();
if (my_mkdir (absdir, 0777) == 0) {
-diff -Nurwd mc-4.6.2~pre1.orig/src/file.c mc-4.6.2~pre1/src/file.c
---- mc-4.6.2~pre1.orig/src/file.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/src/file.c 2008-02-13 21:01:06.000000000 +0100
-@@ -73,6 +73,9 @@
+Index: mc-4.6.2~git20080311/src/file.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/file.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/file.c 2008-06-09 18:00:33.000000000 +0200
+@@ -75,6 +75,9 @@
#include "../vfs/vfs-impl.h"
/* }}} */
@@ -323,7 +317,7 @@
/* Hack: the vfs code should not rely on this */
#define WITH_FULL_PATHS 1
-@@ -917,7 +920,11 @@
+@@ -919,7 +922,11 @@
}
/* Dive into subdir if exists */
if (toplevel && ctx->dive_into_subdirs) {
@@ -335,7 +329,7 @@
} else {
dest_dir = g_strdup (d);
goto dont_mkdir;
-@@ -967,7 +974,11 @@
+@@ -969,7 +976,11 @@
(*ctx->stat_func) (path, &buf);
if (S_ISDIR (buf.st_mode)) {
@@ -347,7 +341,7 @@
/*
* From here, we just intend to recursively copy subdirs, not
* the double functionality of copying different when the target
-@@ -978,7 +989,11 @@
+@@ -980,7 +991,11 @@
parent_dirs, progress_count, progress_bytes);
g_free (mdpath);
} else {
@@ -359,7 +353,7 @@
return_status = copy_file_file (ctx, path, dest_file, 1,
progress_count, progress_bytes, 0);
g_free (dest_file);
-@@ -1168,7 +1183,12 @@
+@@ -1170,7 +1185,12 @@
destdir = g_strdup (d);
move_over = 1;
} else
@@ -372,7 +366,7 @@
if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) {
int msize = COLS - 36;
-@@ -1873,7 +1893,12 @@
+@@ -1875,7 +1895,12 @@
if (temp == NULL) {
value = transform_error;
} else {
@@ -385,7 +379,7 @@
g_free (dest);
dest = temp2;
temp = NULL;
-@@ -1967,7 +1992,12 @@
+@@ -1971,7 +1996,12 @@
if (temp == NULL)
value = transform_error;
else {
@@ -396,12 +390,13 @@
+#endif
+
- switch (operation) {
- case OP_COPY:
-diff -Nurwd mc-4.6.2~pre1.orig/src/filegui.c mc-4.6.2~pre1/src/filegui.c
---- mc-4.6.2~pre1.orig/src/filegui.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/src/filegui.c 2008-02-13 21:01:06.000000000 +0100
-@@ -67,6 +67,10 @@
+ source_with_path = unescape_string(source_with_path);
+ temp2 = unescape_string(temp2);
+Index: mc-4.6.2~git20080311/src/filegui.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/filegui.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/filegui.c 2008-06-09 18:00:33.000000000 +0200
+@@ -68,6 +68,10 @@
#include "util.h" /* strip_password() */
#include "tty.h"
@@ -412,7 +407,7 @@
/* }}} */
/* Hack: the vfs code should not rely on this */
-@@ -721,57 +725,79 @@
+@@ -722,57 +726,79 @@
}
}
@@ -456,31 +451,11 @@
+ #define Y_OK 9
+#endif
+
- #ifdef WITH_BACKGROUND
--# define SKIP 5
--# define FMCB21 11
--# define FMCB22 10
--# define FMBLFT 9
--# define FMBMID 8
-- {quick_button, 25, 64, 9, FMDY, N_("&Background"), 0, B_USER, 0, 0,
-- NULL},
--#else /* WITH_BACKGROUND */
--# define SKIP 4
--# define FMCB21 10
--# define FMCB22 9
--# define FMBLFT 8
--# undef FMBMID
++#ifdef WITH_BACKGROUND
+ #define ADD 0
+#else
+ #define ADD -1
- #endif
-- {quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, NULL},
-- {quick_checkbox, 42, 64, 8, FMDY, N_("&Stable Symlinks"), 0, 0,
-- 0 /* &file_mask_stable_symlinks */ , 0, NULL},
-- {quick_checkbox, 31, 64, 7, FMDY, N_("&Dive into subdir if exists"), 0,
-- 0,
-- 0 /* &dive_into_subdirs */ , 0, NULL},
-- NULL_QuickWidget
++#endif
+
+ #define FM_STAB_SYM 0
+ #define FM_DIVE_INTO_SUBDIR 1
@@ -522,7 +497,28 @@
+ {quick_input, 3, 64, 3, FMDY, "", 58, 0, 0, 0, "input-def"},
+ {quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, "ql"},
+ {quick_button, 42,64, Y_OK, FMDY, N_("&Cancel"), 0, B_CANCEL, 0,0, "cancel"},
-+#ifdef WITH_BACKGROUND
+ #ifdef WITH_BACKGROUND
+-# define SKIP 5
+-# define FMCB21 11
+-# define FMCB22 10
+-# define FMBLFT 9
+-# define FMBMID 8
+- {quick_button, 25, 64, 9, FMDY, N_("&Background"), 0, B_USER, 0, 0,
+- NULL},
+-#else /* WITH_BACKGROUND */
+-# define SKIP 4
+-# define FMCB21 10
+-# define FMCB22 9
+-# define FMBLFT 8
+-# undef FMBMID
+-#endif
+- {quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, NULL},
+- {quick_checkbox, 42, 64, 8, FMDY, N_("&Stable Symlinks"), 0, 0,
+- 0 /* &file_mask_stable_symlinks */ , 0, NULL},
+- {quick_checkbox, 31, 64, 7, FMDY, N_("&Dive into subdir if exists"), 0,
+- 0,
+- 0 /* &dive_into_subdirs */ , 0, NULL},
+- NULL_QuickWidget
+ {quick_button, 25,64, Y_OK, FMDY, N_("&Background"), 0, B_USER, 0,0, "back"},
+#endif
+ {quick_button, 14,64, Y_OK, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, "ok"},
@@ -536,7 +532,7 @@
};
static int
-@@ -805,48 +831,48 @@
+@@ -806,48 +832,48 @@
if (fmd_widgets[i].text[0] != '\0')
fmd_widgets[i].text = _(fmd_widgets[i].text);
@@ -604,7 +600,7 @@
}
#undef chkbox_xpos
-@@ -866,6 +892,9 @@
+@@ -867,6 +893,9 @@
int val;
QuickDialog Quick_input;
char *def_text;
@@ -614,7 +610,7 @@
g_return_val_if_fail (ctx != NULL, NULL);
def_text = g_strdup(def_text_orig);
-@@ -883,10 +912,11 @@
+@@ -884,10 +913,11 @@
/* Set up the result pointers */
@@ -630,7 +626,7 @@
/* filter out a possible password from def_text */
def_text_secure = strip_password (g_strdup (def_text), 1);
-@@ -894,8 +924,9 @@
+@@ -895,8 +925,9 @@
/* Create the dialog */
ctx->stable_symlinks = 0;
@@ -642,7 +638,7 @@
Quick_input.xlen = fmd_xlen;
Quick_input.xpos = -1;
Quick_input.title = op_names[operation];
-@@ -903,19 +934,37 @@
+@@ -904,19 +935,37 @@
Quick_input.ylen = FMDY;
Quick_input.i18n = 1;
Quick_input.widgets = fmd_widgets;
@@ -685,7 +681,7 @@
if (ctx->follow_links)
ctx->stat_func = mc_stat;
-@@ -937,6 +986,7 @@
+@@ -938,6 +987,7 @@
orig_mask = source_mask;
if (!dest_dir || !*dest_dir) {
g_free (source_mask);
@@ -693,7 +689,7 @@
g_free(def_text);
return dest_dir;
}
-@@ -991,6 +1041,48 @@
+@@ -992,6 +1042,48 @@
}
if (val == B_USER)
*do_background = 1;
@@ -742,10 +738,11 @@
g_free(def_text);
return dest_dir;
}
-diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.c mc-4.6.2~pre1/src/fileopctx.c
---- mc-4.6.2~pre1.orig/src/fileopctx.c 2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.2~pre1/src/fileopctx.c 2008-02-13 21:01:06.000000000 +0100
-@@ -25,8 +25,12 @@
+Index: mc-4.6.2~git20080311/src/fileopctx.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/fileopctx.c 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/fileopctx.c 2008-06-09 18:00:33.000000000 +0200
+@@ -26,8 +26,12 @@
#include <unistd.h>
#include "global.h"
@@ -759,7 +756,7 @@
/**
* file_op_context_new:
-@@ -53,6 +57,12 @@
+@@ -54,6 +58,12 @@
ctx->umask_kill = 0777777;
ctx->erase_at_end = TRUE;
@@ -772,9 +769,10 @@
return ctx;
}
-diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.h mc-4.6.2~pre1/src/fileopctx.h
---- mc-4.6.2~pre1.orig/src/fileopctx.h 2004-10-06 20:06:26.000000000 +0200
-+++ mc-4.6.2~pre1/src/fileopctx.h 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/fileopctx.h
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/fileopctx.h 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/fileopctx.h 2008-06-09 18:00:33.000000000 +0200
@@ -108,6 +108,14 @@
/* User interface data goes here */
@@ -790,10 +788,11 @@
} FileOpContext;
-diff -Nurwd mc-4.6.2~pre1.orig/src/main.c mc-4.6.2~pre1/src/main.c
---- mc-4.6.2~pre1.orig/src/main.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/src/main.c 2008-02-13 21:01:06.000000000 +0100
-@@ -81,6 +81,7 @@
+Index: mc-4.6.2~git20080311/src/main.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/main.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/main.c 2008-06-09 18:00:33.000000000 +0200
+@@ -82,6 +82,7 @@
#ifdef HAVE_CHARSET
#include "charsets.h"
@@ -801,7 +800,7 @@
#endif /* HAVE_CHARSET */
#ifdef USE_VFS
-@@ -97,6 +98,7 @@
+@@ -98,6 +99,7 @@
/* The structures for the panels */
WPanel *left_panel = NULL;
WPanel *right_panel = NULL;
@@ -809,7 +808,7 @@
/* The pointer to the tree */
WTree *the_tree = NULL;
-@@ -586,6 +588,7 @@
+@@ -590,6 +592,7 @@
}
directory = *new_dir ? new_dir : home_dir;
@@ -817,7 +816,7 @@
if (mc_chdir (directory) == -1) {
strcpy (panel->cwd, olddir);
g_free (olddir);
-@@ -804,6 +807,10 @@
+@@ -808,6 +811,10 @@
{' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
{' ', N_("&Info C-x i"), 'I', info_cmd},
{' ', N_("&Tree"), 'T', tree_cmd},
@@ -828,7 +827,7 @@
{' ', "", ' ', 0},
{' ', N_("&Sort order..."), 'S', sort_cmd},
{' ', "", ' ', 0},
-@@ -828,6 +835,10 @@
+@@ -832,6 +839,10 @@
{' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
{' ', N_("&Info C-x i"), 'I', info_cmd},
{' ', N_("&Tree"), 'T', tree_cmd},
@@ -839,9 +838,10 @@
{' ', "", ' ', 0},
{' ', N_("&Sort order..."), 'S', sort_cmd},
{' ', "", ' ', 0},
-diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.am mc-4.6.2~pre1/src/Makefile.am
---- mc-4.6.2~pre1.orig/src/Makefile.am 2006-02-04 12:13:30.000000000 +0100
-+++ mc-4.6.2~pre1/src/Makefile.am 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/Makefile.am
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/Makefile.am 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/Makefile.am 2008-06-09 18:00:33.000000000 +0200
@@ -41,7 +41,8 @@
mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
@@ -863,9 +863,10 @@
tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
widget.h win.c win.h wtools.c wtools.h unixcompat.h \
-diff -Nurwd mc-4.6.2~pre1.orig/src/panel.h mc-4.6.2~pre1/src/panel.h
---- mc-4.6.2~pre1.orig/src/panel.h 2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.2~pre1/src/panel.h 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/panel.h
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/panel.h 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/panel.h 2008-06-09 18:00:33.000000000 +0200
@@ -71,6 +71,19 @@
int searching;
@@ -894,9 +895,10 @@
void try_to_select (WPanel *panel, const char *name);
-diff -Nurwd mc-4.6.2~pre1.orig/src/recode.c mc-4.6.2~pre1/src/recode.c
---- mc-4.6.2~pre1.orig/src/recode.c 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/src/recode.c 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/recode.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~git20080311/src/recode.c 2008-06-09 18:00:33.000000000 +0200
@@ -0,0 +1,153 @@
+#include "recode.h"
+#ifdef HAVE_CHARSET
@@ -1051,9 +1053,10 @@
+}
+
+#endif //HAVE_CHARSET
-diff -Nurwd mc-4.6.2~pre1.orig/src/recode.h mc-4.6.2~pre1/src/recode.h
---- mc-4.6.2~pre1.orig/src/recode.h 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/src/recode.h 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/recode.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~git20080311/src/recode.h 2008-06-09 18:00:33.000000000 +0200
@@ -0,0 +1,48 @@
+#ifndef __RECODE_H__
+#define __RECODE_H__
@@ -1103,10 +1106,11 @@
+
+#endif // HAVE_CHARSET
+#endif //__RECODE_H__
-diff -Nurwd mc-4.6.2~pre1.orig/src/screen.c mc-4.6.2~pre1/src/screen.c
---- mc-4.6.2~pre1.orig/src/screen.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/src/screen.c 2008-02-13 21:01:06.000000000 +0100
-@@ -50,6 +50,10 @@
+Index: mc-4.6.2~git20080311/src/screen.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/screen.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/screen.c 2008-06-09 18:00:33.000000000 +0200
+@@ -51,6 +51,10 @@
#include "main.h" /* the_menubar */
#include "unixcompat.h"
@@ -1117,7 +1121,7 @@
#define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
#define J_LEFT 1
-@@ -172,6 +176,7 @@
+@@ -173,6 +177,7 @@
string_file_name (file_entry *fe, int len)
{
size_t i;
@@ -1125,7 +1129,7 @@
#ifdef UTF8
static char buffer [BUF_SMALL * 4];
-@@ -184,6 +189,13 @@
+@@ -185,6 +190,13 @@
static char buffer [BUF_SMALL];
#endif
@@ -1139,7 +1143,7 @@
#ifdef UTF8
if (SLsmg_Is_Unicode)
for (i = 0; i < sizeof (buffer) - 1; i++) {
-@@ -214,7 +226,7 @@
+@@ -215,7 +227,7 @@
for (i = 0; i < sizeof(buffer) - 1; i++) {
char c;
@@ -1148,7 +1152,7 @@
if (!c) break;
-@@ -721,6 +733,10 @@
+@@ -722,6 +734,10 @@
int second_column = 0;
int width, offset;
@@ -1159,7 +1163,7 @@
offset = 0;
if (!isstatus && panel->split){
-@@ -760,7 +776,7 @@
+@@ -761,7 +777,7 @@
}
}
@@ -1168,7 +1172,7 @@
display_mini_info (WPanel *panel)
{
if (!show_mini_info)
-@@ -830,7 +846,7 @@
+@@ -831,7 +847,7 @@
return;
}
@@ -1177,7 +1181,7 @@
paint_dir (WPanel *panel)
{
int i;
-@@ -868,7 +884,7 @@
+@@ -869,7 +885,7 @@
#endif /* !HAVE_SLANG */
}
@@ -1186,7 +1190,7 @@
show_dir (WPanel *panel)
{
char *tmp;
-@@ -897,8 +913,15 @@
+@@ -901,8 +917,15 @@
tmp = g_malloc (panel->widget.cols + 1);
tmp[panel->widget.cols] = '\0';
@@ -1202,7 +1206,7 @@
addstr (tmp);
g_free (tmp);
-@@ -1111,6 +1134,17 @@
+@@ -1115,6 +1138,17 @@
mc_get_current_wd (panel->cwd, sizeof (panel->cwd) - 2);
strcpy (panel->lwd, ".");
@@ -1220,7 +1224,7 @@
panel->hist_name = g_strconcat ("Dir Hist ", panel_name, (char *) NULL);
panel->dir_history = history_get (panel->hist_name);
directory_history_add (panel, panel->cwd);
-@@ -2311,7 +2345,12 @@
+@@ -2315,7 +2349,12 @@
{ XCTRL('n'), move_down }, /* C-n like emacs */
{ XCTRL('s'), start_search }, /* C-s like emacs */
{ ALT('s'), start_search }, /* M-s not like emacs */
@@ -1233,9 +1237,10 @@
{ ALT('o'), chdir_other_panel },
{ ALT('i'), sync_other_panel },
{ ALT('l'), chdir_to_readlink },
-diff -Nurwd mc-4.6.2~pre1.orig/src/screen.h mc-4.6.2~pre1/src/screen.h
---- mc-4.6.2~pre1.orig/src/screen.h 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/src/screen.h 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/screen.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~git20080311/src/screen.h 2008-06-09 18:00:33.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef __SCREEN_H__
+#define __SCREEN_H__
@@ -1248,9 +1253,10 @@
+extern void show_dir(WPanel *panel);
+#endif //__SCREEN_H__
+
-diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.c mc-4.6.2~pre1/src/selcodepage.c
---- mc-4.6.2~pre1.orig/src/selcodepage.c 2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.2~pre1/src/selcodepage.c 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/selcodepage.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/selcodepage.c 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/selcodepage.c 2008-06-09 18:00:33.000000000 +0200
@@ -45,14 +45,16 @@
}
@@ -1301,9 +1307,10 @@
errmsg =
init_translation_table (source_codepage, display_codepage);
if (errmsg) {
-diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.h mc-4.6.2~pre1/src/selcodepage.h
---- mc-4.6.2~pre1.orig/src/selcodepage.h 2005-06-14 15:14:49.000000000 +0200
-+++ mc-4.6.2~pre1/src/selcodepage.h 2008-02-13 21:01:06.000000000 +0100
+Index: mc-4.6.2~git20080311/src/selcodepage.h
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/selcodepage.h 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/src/selcodepage.h 2008-06-09 18:00:33.000000000 +0200
@@ -2,8 +2,8 @@
#define MC_SELCODEPAGE_H
@@ -1315,10 +1322,11 @@
#endif /* HAVE_CHARSET */
#endif
-diff -Nurwd mc-4.6.2~pre1.orig/src/setup.c mc-4.6.2~pre1/src/setup.c
---- mc-4.6.2~pre1.orig/src/setup.c 2006-02-23 16:32:18.000000000 +0100
-+++ mc-4.6.2~pre1/src/setup.c 2008-02-13 21:01:06.000000000 +0100
-@@ -48,6 +48,8 @@
+Index: mc-4.6.2~git20080311/src/setup.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/setup.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/setup.c 2008-06-09 18:00:33.000000000 +0200
+@@ -49,6 +49,8 @@
#ifdef HAVE_CHARSET
#include "charsets.h"
@@ -1327,7 +1335,7 @@
#endif
#ifdef USE_NETCODE
-@@ -269,6 +271,11 @@
+@@ -272,6 +274,11 @@
g_snprintf (buffer, sizeof (buffer), "%d", panel->user_mini_status);
save_string (section, "user_mini_status", buffer,
profile_name);
@@ -1339,7 +1347,7 @@
}
void
-@@ -371,6 +378,7 @@
+@@ -374,6 +381,7 @@
#ifdef HAVE_CHARSET
save_string( "Misc", "display_codepage",
get_codepage_id( display_codepage ), profile_name );
@@ -1347,7 +1355,7 @@
#endif /* HAVE_CHARSET */
g_free (profile);
-@@ -420,6 +428,31 @@
+@@ -423,6 +431,31 @@
panel->user_mini_status =
load_int (section, "user_mini_status", 0);
@@ -1379,7 +1387,7 @@
}
static void
-@@ -569,10 +602,16 @@
+@@ -572,10 +605,16 @@
#ifdef HAVE_CHARSET
if ( load_codepages_list() > 0 ) {
char cpname[128];
@@ -1400,10 +1408,11 @@
}
init_translation_table( source_codepage, display_codepage );
-diff -Nurwd mc-4.6.2~pre1.orig/src/view.c mc-4.6.2~pre1/src/view.c
---- mc-4.6.2~pre1.orig/src/view.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/src/view.c 2008-02-13 21:01:06.000000000 +0100
-@@ -3232,7 +3232,7 @@
+Index: mc-4.6.2~git20080311/src/view.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/view.c 2008-06-09 18:00:24.000000000 +0200
++++ mc-4.6.2~git20080311/src/view.c 2008-06-09 18:00:33.000000000 +0200
+@@ -3233,7 +3233,7 @@
#ifdef HAVE_CHARSET
case XCTRL ('t'):
@@ -1412,10 +1421,11 @@
view->dirty++;
view_update (view);
return MSG_HANDLED;
-diff -Nurwd mc-4.6.2~pre1.orig/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
---- mc-4.6.2~pre1.orig/vfs/vfs.c 2008-02-13 21:01:43.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/vfs.c 2008-02-13 21:01:06.000000000 +0100
-@@ -53,6 +53,11 @@
+Index: mc-4.6.2~git20080311/vfs/vfs.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/vfs/vfs.c 2008-02-19 18:25:27.000000000 +0100
++++ mc-4.6.2~git20080311/vfs/vfs.c 2008-06-09 18:00:33.000000000 +0200
+@@ -54,6 +54,11 @@
#include "smbfs.h"
#include "local.h"
@@ -1427,7 +1437,7 @@
/* They keep track of the current directory */
static struct vfs_class *current_vfs;
static char *current_dir;
-@@ -685,8 +690,66 @@
+@@ -686,8 +691,66 @@
vfsid old_vfsid;
int result;
@@ -1494,7 +1504,7 @@
if (!new_vfs->chdir) {
g_free (new_dir);
return -1;
-@@ -700,9 +763,6 @@
+@@ -701,9 +764,6 @@
return -1;
}
More information about the Pkg-mc-commits
mailing list