Author: arekm Date: Wed Apr 16 18:02:18 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up for 4.6.2pre1
---- Files affected:
SOURCES:
mc-pld-developerfriendly.patch (1.3 -> 1.4) , mc-pl.patch (1.8 -> 1.9) ,
mc-utf8-look-and-feel.patch (1.2 -> 1.3) , mc-utf8.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SOURCES/mc-pld-developerfriendly.patch
diff -u SOURCES/mc-pld-developerfriendly.patch:1.3
SOURCES/mc-pld-developerfriendly.patch:1.4
--- SOURCES/mc-pld-developerfriendly.patch:1.3 Tue Feb 28 17:52:01 2006
+++ SOURCES/mc-pld-developerfriendly.patch Wed Apr 16 20:02:12 2008
@@ -30,9 +30,9 @@
cs.syntax \
css.syntax \
+ cvs-userlist.syntax \
+ d.syntax \
diff.syntax \
dos.syntax \
- eiffel.syntax \
@@ -28,6 +29,7 @@
pascal.syntax \
perl.syntax \
@@ -49,9 +49,9 @@
cs.syntax \
css.syntax \
+ cvs-userlist.syntax \
+ d.syntax \
diff.syntax \
dos.syntax \
- eiffel.syntax \
@@ -262,6 +263,7 @@
pascal.syntax \
perl.syntax \
@@ -84,156 +84,3 @@
+
file .\* unknown
include unknown.syntax
-diff -urN mc-2006-02-24-22.org/syntax/Syntax.orig
mc-2006-02-24-22/syntax/Syntax.orig
---- mc-2006-02-24-22.org/syntax/Syntax.orig 1970-01-01 01:00:00.000000000
+0100
-+++ mc-2006-02-24-22/syntax/Syntax.orig 2005-10-31 22:15:34.000000000
+0100
-@@ -0,0 +1,149 @@
-+# This file describes which highlighting scheme is applied to a particular
-+# file in mcedit.
-+#
-+# Each entry consists of two lines: a "file" specification and the
-+# corresponding highlighting definition ("include"). A file specification
-+# can have two or three fields, each separated by white-space characters.
-+#
-+# The first field is a regular expression that is matched against the file
-+# name. The second field is a description of the file type and is
-+# currently unused. The third (optional) field is a regular expression
-+# that is matched against the first line of the file. The first entry
-+# that matches wins, that is, all the entries below are ignored.
-+#
-+# Certain characters must be quoted in these fields. These are space (\s),
-+# tabs (\t), backslashes(\\), plus (\+) and asterisk (\*). Braces {} and
-+# brackets [] must not be quoted in this file. However, they have a special
-+# meaning when used in the actual syntax definitions.
-+#
-+# You can use the following colors in the syntax highlighting files:
-+# black, blue, brightblue, brightcyan, brightgreen, brightmagenta,
-+# brightred, brown, cyan, gray, green, lightgray, magenta, red, white,
-+# yellow
-+#
-+
-+file [Ss]yntax$ Syntax\sHighlighting\sdefinitions ^#\ssyntax\srules\sversion\s
-+include syntax.syntax
-+
-+file ..\*\\.(e)$ Eiffel\sSource\sFile
-+include eiffel.syntax
-+
-+file ..\*\\.(diff|rej|patch)$ Diff\sOutput ^(diff|Index:)\s
-+include diff.syntax
-+
-+file ..\*\\.lsm$ LSM\sFile
-+include lsm.syntax
-+
-+file ..\*\\.sh$ Shell\sScript ^#!.\*([\s/]([abd-z]?|ba|pdk)sh|@SH@)
-+include sh.syntax
-+
-+file ..\*\\.(pl|PL|pm|PM)$ Perl\sProgram ^#!.\*([\s/]perl|@PERL@)
-+include perl.syntax
-+
-+file ..\*\\.(py|PY)$ Python\sProgram ^#!.\*([\s/]python|@PYTHON@)
-+include python.syntax
-+
-+file ..\*\\.(rb|RB)$ Ruby\sProgram ^#!.\*([\s/]ruby|@RUBY@)
-+include ruby.syntax
-+
-+file ..\*\\.(man|[0-9n]|[0-9]x)$ NROFF\sSource
-+include nroff.syntax
-+
-+file ..\*\\.(htm|html|HTM|HTML)$ HTML\sFile
-+include html.syntax
-+
-+file ..\*\\.(xml|XML|xsd|XSD|xslt?|XSLT?|dtd|DTD|qpg|qpg.in)$ XML\sdocument
(\\?xml\sversion|!DOCTYPE\s)
-+include xml.syntax
-+
-+file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|Kbuild)$ Makefile
-+include makefile.syntax
-+
-+file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram
-+include pascal.syntax
-+
-+file ..\*\\.(ada|adb|ads|ADA|ADB|ADS)$ Ada\sProgram
-+include ada95.syntax
-+
-+file ..\*\\.(tcl|itcl|TCL|ITCL)$ Tcl\sProgram
-+include tcl.syntax
-+
-+file ..\*\\.(sl|SL)$ S-Lang\sProgram
-+include slang.syntax
-+
-+file ..\*\\.tex$ LaTeX\s2.09\sDocument
-+include latex.syntax
-+
-+file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument
-+include texinfo.syntax
-+
-+file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
-+include c.syntax
-+
-+file ..\*\\.[fF]$ Fortran\sProgram
-+include fortran.syntax
-+
-+file ..\*\\.i$ SWIG\sSource
-+include swig.syntax
-+
-+file ..\*\\.(php|PHP)[0-9]?$ PHP\sProgram
-+include php.syntax
-+
-+file ..\*\\.(java|JAVA|Java|jav)$ Java\sProgram
-+include java.syntax
-+
-+file ..\*\\.(cs|CS)$ C\#\sProgram
-+include cs.syntax
-+
-+file ..\*\\.(js|JS)$ JavaScript\sProgram
-+include js.syntax
-+
-+file ..\*\\.(asax|aspx|ascx|asmx|ashx)$ ASPX\sFile
-+include aspx.syntax
-+
-+file ..\*\\.st$ SmallTalk\sProgram
-+include smalltalk.syntax
-+
-+file ..\*\\.(lisp|lsp|el)$ Lisp\sProgram
-+include lisp.syntax
-+
-+file ..\*\\.(ml|mli|mly|mll|mlp)$ ML\sProgram
-+include ml.syntax
-+
-+file ..\*\\.m$ Matlab\sor\sOctave\sFile
-+include octave.syntax
-+
-+file ..\*\\.(sql|SQL)$ SQL\sProgram
-+include sql.syntax
-+
-+file ..\*\\.(spec|spec\.in)$ RPM\sSpecfile
-+include spec.syntax
-+
-+file .\*ChangeLog[\\\.A-Za-z0-9_]\*$ GNU\sChangeLog\sFile
-+include changelog.syntax
-+
-+file (..\*\\.m4$|configure\\.in|configure\\.ac) M4\sMacroprocessor\sSource
-+include m4.syntax
-+
-+file ..\*\\.(bat|cmd)$ DOS\sBatch
-+include dos.syntax
-+
-+file ..\*\\.(po|pot|pox)$ PO\sFile
-+include po.syntax
-+
-+file ..\*\\.([Aa][Ss][Mm]|s|S)$ ASM\sProgram
-+include assembler.syntax
-+
-+file ..\*\\.([Pp][Oo][Vv])$ POV\sScript
-+include povray.syntax
-+
-+file ..\*\\.([lL][uU][aA])$ LUA\sProgram
-+include lua.syntax
-+
-+file ..\*\\.([iI][dD][lL])$ CORBA\sIDL
-+include idl.syntax
-+
-+file Don_t_match_me Mail\sfolder ^From\s
-+include mail.syntax
-+
-+file .\* unknown
-+include unknown.syntax
================================================================
Index: SOURCES/mc-pl.patch
diff -u SOURCES/mc-pl.patch:1.8 SOURCES/mc-pl.patch:1.9
--- SOURCES/mc-pl.patch:1.8 Tue Sep 11 21:18:12 2007
+++ SOURCES/mc-pl.patch Wed Apr 16 20:02:12 2008
@@ -404,11 +404,11 @@
msgstr " Menu u�ytkownika"
msgid "%b %e %H:%M"
--msgstr "%e %b %H:%M"
+-msgstr "%e.%m %H:%M"
+msgstr "%d.%m %H:%M"
msgid "%b %e %Y"
--msgstr "%e %b %Y"
+-msgstr "%e.%m.%Y "
+msgstr "%d.%m.%Y "
#, c-format
================================================================
Index: SOURCES/mc-utf8-look-and-feel.patch
diff -u SOURCES/mc-utf8-look-and-feel.patch:1.2
SOURCES/mc-utf8-look-and-feel.patch:1.3
--- SOURCES/mc-utf8-look-and-feel.patch:1.2 Wed Sep 27 22:59:12 2006
+++ SOURCES/mc-utf8-look-and-feel.patch Wed Apr 16 20:02:12 2008
@@ -78,7 +78,7 @@
+#else
+ if (color) attrset (MARKED_COLOR);
+ if (is_utf8)
-+ SLsmg_write_string("▴");
++ SLsmg_write_string("↑");
+ else
+ addch ('^');
+ if (color) attrset (NORMAL_COLOR);
@@ -98,7 +98,7 @@
+#else
+ if (color) attrset (MARKED_COLOR);
+ if (is_utf8)
-+ SLsmg_write_string("▾");
++ SLsmg_write_string("↓");
else
- addch ('v');
+ addch('v');
@@ -136,7 +136,7 @@
+ else {
+ if (color) attrset (MARKED_COLOR);
+ if (is_utf8)
-+ SLsmg_write_string("◈");
++ SLsmg_write_string("▮");
+ else
+ addch('*');
+ if (color) attrset (NORMAL_COLOR);
================================================================
Index: SOURCES/mc-utf8.patch
diff -u SOURCES/mc-utf8.patch:1.8 SOURCES/mc-utf8.patch:1.9
--- SOURCES/mc-utf8.patch:1.8 Mon Sep 10 19:31:04 2007
+++ SOURCES/mc-utf8.patch Wed Apr 16 20:02:12 2008
@@ -1,1117 +1,884 @@
---- mc/acinclude.m4.utf8 2006-09-09 00:35:29.000000000 +0200
-+++ mc/acinclude.m4 2007-01-04 16:20:56.000000000 +0100
-@@ -399,14 +399,14 @@ AC_DEFUN([MC_WITH_SLANG], [
- fi
+diff -up mc-4.6.2-pre1/src/filegui.c.utf8 mc-4.6.2-pre1/src/filegui.c
+--- mc-4.6.2-pre1/src/filegui.c.utf8 2007-08-23 15:16:39.000000000 +0200
++++ mc-4.6.2-pre1/src/filegui.c 2008-02-25 14:56:22.000000000 +0100
+@@ -65,6 +65,7 @@
+ #include "filegui.h"
+ #include "key.h" /* get_event */
+ #include "util.h" /* strip_password() */
++#include "tty.h"
- dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
-- if test x$with_screen = xslang; then
-- :
-- m4_if([$1], strict, ,
-- [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
-- [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
--it's not fully supported yet])
-- with_screen=mcslang])])
-- fi
-+dnl if test x$with_screen = xslang; then
-+dnl :
-+dnl m4_if([$1], strict, ,
-+dnl [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
-+dnl [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
-+dnl it's not fully supported yet])
-+dnl with_screen=mcslang])])
-+dnl fi
+ /* }}} */
- if test x$with_screen = xslang; then
- AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
---- mc/src/layout.c.utf8 2006-11-10 01:22:30.000000000 +0100
-+++ mc/src/layout.c 2007-01-04 16:20:56.000000000 +0100
-@@ -366,36 +366,36 @@ init_layout (void)
+@@ -563,8 +564,8 @@ init_replace (FileOpContext *ctx, enum O
+ * longest of "Overwrite..." labels
+ * (assume "Target date..." are short enough)
+ */
+- l1 = max (strlen (rd_widgets[6].text),
+- strlen (rd_widgets[11].text));
++ l1 = max (mbstrlen (rd_widgets[6].text),
++ mbstrlen (rd_widgets[11].text));
- while (i--) {
- s_split_direction[i] = _(s_split_direction[i]);
-- l1 = strlen (s_split_direction[i]) + 7;
-+ l1 = mbstrlen (s_split_direction[i]) + 7;
- if (l1 > first_width)
- first_width = l1;
+ /* longest of button rows */
+ i = sizeof (rd_widgets) / sizeof (rd_widgets[0]);
+@@ -575,7 +576,7 @@ init_replace (FileOpContext *ctx, enum O
+ l2 = max (l2, l);
+ l = 0;
+ }
+- l += strlen (rd_widgets[i].text) + 4;
++ l += mbstrlen (rd_widgets[i].text) + 4;
+ }
}
-
- for (i = 0; i <= 8; i++) {
- check_options[i].text = _(check_options[i].text);
-- l1 = strlen (check_options[i].text) + 7;
-+ l1 = mbstrlen (check_options[i].text) + 7;
- if (l1 > first_width)
- first_width = l1;
+ l2 = max (l2, l); /* last row */
+@@ -593,12 +594,12 @@ init_replace (FileOpContext *ctx, enum O
+ l = l1;
+ }
+ rd_widgets[i].xpos = l;
+- l += strlen (rd_widgets[i].text) + 4;
++ l += mbstrlen (rd_widgets[i].text) + 4;
+ }
}
+ /* Abort button is centered */
+ rd_widgets[1].xpos =
+- (rd_xlen - strlen (rd_widgets[1].text) - 3) / 2;
++ (rd_xlen - mbstrlen (rd_widgets[1].text) - 3) / 2;
+ }
+ #endif /* ENABLE_NLS */
-- l1 = strlen (title1) + 1;
-+ l1 = mbstrlen (title1) + 1;
- if (l1 > first_width)
- first_width = l1;
-
-- l1 = strlen (title2) + 1;
-+ l1 = mbstrlen (title2) + 1;
- if (l1 > first_width)
- first_width = l1;
-
+@@ -617,7 +618,7 @@ init_replace (FileOpContext *ctx, enum O
-- second_width = strlen (title3) + 1;
-+ second_width = mbstrlen (title3) + 1;
- for (i = 0; i < 6; i++) {
- check_options[i].text = _(check_options[i].text);
-- l1 = strlen (check_options[i].text) + 7;
-+ l1 = mbstrlen (check_options[i].text) + 7;
- if (l1 > second_width)
- second_width = l1;
- }
- if (console_flag) {
-- l1 = strlen (output_lines_label) + 13;
-+ l1 = mbstrlen (output_lines_label) + 13;
- if (l1 > second_width)
- second_width = l1;
- }
-@@ -409,14 +409,14 @@ init_layout (void)
- *
- * Now the last thing to do - properly space buttons...
- */
-- l1 = 11 + strlen (ok_button) /* 14 - all brackets and inner space */
-- +strlen (save_button) /* notice: it is 3 char less because */
-- +strlen (cancel_button); /* of '&' char in button text */
-+ l1 = 11 + mbstrlen (ok_button) /* 14 - all brackets and inner space */
-+ +mbstrlen (save_button) /* notice: it is 3 char less because */
-+ +mbstrlen (cancel_button); /* of '&' char in button text */
+ ADD_RD_LABEL (ui, 0,
+ name_trunc (ui->replace_filename,
+- rd_trunc - strlen (rd_widgets[0].text)), 0);
++ rd_trunc - mbstrlen (rd_widgets[0].text)), 0);
+ ADD_RD_BUTTON (1);
- i = (first_width + second_width - l1) / 4;
- b1 = 5 + i;
-- b2 = b1 + strlen (ok_button) + i + 6;
-- b3 = b2 + strlen (save_button) + i + 4;
-+ b2 = b1 + mbstrlen (ok_button) + i + 6;
-+ b3 = b2 + mbstrlen (save_button) + i + 4;
+ ADD_RD_BUTTON (2);
+@@ -804,36 +805,36 @@ fmd_init_i18n (int force)
+ if (fmd_widgets[i].text[0] != '\0')
+ fmd_widgets[i].text = _(fmd_widgets[i].text);
- i18n_layt_flag = 1;
- }
-@@ -684,7 +684,7 @@ setup_panels (void)
- panel_do_cols (0);
- panel_do_cols (1);
+- len = strlen (fmd_widgets[FMCB11].text)
+- + strlen (fmd_widgets[FMCB21].text) + 15;
++ len = mbstrlen (fmd_widgets[FMCB11].text)
++ + mbstrlen (fmd_widgets[FMCB21].text) + 15;
+ fmd_xlen = max (fmd_xlen, len);
-- promptl = strlen (prompt);
-+ promptl = mbstrlen (prompt);
+- len = strlen (fmd_widgets[FMCB12].text)
+- + strlen (fmd_widgets[FMCB22].text) + 15;
++ len = mbstrlen (fmd_widgets[FMCB12].text)
++ + mbstrlen (fmd_widgets[FMCB22].text) + 15;
+ fmd_xlen = max (fmd_xlen, len);
- widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
+- len = strlen (fmd_widgets[FMBRGT].text)
+- + strlen (fmd_widgets[FMBLFT].text) + 11;
++ len = mbstrlen (fmd_widgets[FMBRGT].text)
++ + mbstrlen (fmd_widgets[FMBLFT].text) + 11;
---- mc/src/tty.c.utf8 2006-05-23 16:20:39.000000000 +0200
-+++ mc/src/tty.c 2007-01-04 16:20:56.000000000 +0100
-@@ -134,10 +134,12 @@ tty_print_char(int c)
- * defined or not. Congratulations! At least, they left the API call
- * for SLsmg_write_nchars as it has always been.
- */
-- char ch;
--
-- ch = c;
-- SLsmg_write_nchars(&ch, 1);
-+
-+ /* The above comment is a nonsense, SLsmg_write_char(c) works pretty
-+ * good for me. So please don't mess with Red Hat people.
-+ * Jindrich Novy ([EMAIL
PROTECTED])
-+ */
-+ SLsmg_write_char(c);
- #else
- addch(c);
+ #ifdef FMBMID
+- len += strlen (fmd_widgets[FMBMID].text) + 6;
++ len += mbstrlen (fmd_widgets[FMBMID].text) + 6;
#endif
---- mc/src/option.c.utf8 2006-02-28 18:44:28.000000000 +0100
-+++ mc/src/option.c 2007-01-04 16:20:56.000000000 +0100
-@@ -123,12 +123,12 @@ init_configure (void)
- title2 = _(" Pause after run... ");
- title3 = _(" Other options ");
-
-- first_width = strlen (title1) + 1;
-- second_width = strlen (title3) + 1;
-+ first_width = mbstrlen (title1) + 1;
-+ second_width = mbstrlen (title3) + 1;
-
- for (i = 0; check_options[i].text; i++) {
- check_options[i].text = _(check_options[i].text);
-- l1 = strlen (check_options[i].text) + 7;
-+ l1 = mbstrlen (check_options[i].text) + 7;
- if (i >= OTHER_OPTIONS) {
- if (l1 > first_width)
- first_width = l1;
-@@ -141,23 +141,23 @@ init_configure (void)
- i = PAUSE_OPTIONS;
- while (i--) {
- pause_options[i] = _(pause_options[i]);
-- l1 = strlen (pause_options[i]) + 7;
-+ l1 = mbstrlen (pause_options[i]) + 7;
- if (l1 > first_width)
- first_width = l1;
- }
-- l1 = strlen (title2) + 1;
-+ l1 = mbstrlen (title2) + 1;
- if (l1 > first_width)
- first_width = l1;
+ fmd_xlen = max (fmd_xlen, len + 4);
-- l1 = 11 + strlen (ok_button)
-- + strlen (save_button)
-- + strlen (cancel_button);
-+ l1 = 11 + mbstrlen (ok_button)
-+ + mbstrlen (save_button)
-+ + mbstrlen (cancel_button);
+ len = (fmd_xlen - (len + 6)) / 2;
+ i = fmd_widgets[FMBLFT].relative_x = len + 3;
+- i += strlen (fmd_widgets[FMBLFT].text) + 8;
++ i += mbstrlen (fmd_widgets[FMBLFT].text) + 8;
- i = (first_width + second_width - l1) / 4;
- b1 = 5 + i;
-- b2 = b1 + strlen (ok_button) + i + 6;
-- b3 = b2 + strlen (save_button) + i + 4;
-+ b2 = b1 + mbstrlen (ok_button) + i + 6;
-+ b3 = b2 + mbstrlen (save_button) + i + 4;
+ #ifdef FMBMID
+ fmd_widgets[FMBMID].relative_x = i;
+- i += strlen (fmd_widgets[FMBMID].text) + 6;
++ i += mbstrlen (fmd_widgets[FMBMID].text) + 6;
+ #endif
- i18n_config_flag = 1;
- }
---- mc/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100
-+++ mc/src/menu.h 2007-01-04 16:20:56.000000000 +0100
-@@ -21,6 +21,8 @@ typedef struct Menu {
- menu_entry *entries;
- int start_x; /* position relative to menubar start */
- char *help_node;
-+ wchar_t **wentries;
-+ wchar_t *wname;
- } Menu;
+ fmd_widgets[FMBRGT].relative_x = i;
- extern int menubar_visible;
---- mc/src/menu.c.utf8 2005-09-06 22:36:23.000000000 +0200
-+++ mc/src/menu.c 2007-01-04 16:20:56.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <string.h>
+ #define chkbox_xpos(i) \
+- fmd_widgets [i].relative_x = fmd_xlen - strlen (fmd_widgets [i].text) -
6
++ fmd_widgets [i].relative_x = fmd_xlen - mbstrlen (fmd_widgets [i].text)
- 6
- #include <sys/types.h>
-+#include <wchar.h>
+ chkbox_xpos (FMCB0);
+ chkbox_xpos (FMCB21);
+@@ -855,7 +856,7 @@ fmd_init_i18n (int force)
- #include "global.h"
- #include "tty.h"
-@@ -53,35 +54,95 @@ create_menu (const char *name, menu_entr
+ char *
+ file_mask_dialog (FileOpContext *ctx, FileOperation operation, const char
*text,
+- const char *def_text, int only_one, int *do_background)
++ const char *def_text_orig, int only_one, int *do_background)
{
- Menu *menu;
- const char *cp;
-+ int wlen = 0;
-+ mbstate_t s;
-
- menu = (Menu *) g_malloc (sizeof (*menu));
- menu->count = count;
- menu->max_entry_len = 20;
- menu->entries = entries;
-+ menu->name = g_strdup (name);
-+ menu_scan_hotkey (menu);
-+#ifdef UTF8
-+ menu->wentries = NULL;
-+ menu->wname = NULL;
-+ if (SLsmg_Is_Unicode) {
-+ const char *str = menu->name;
-+ memset (&s, 0, sizeof (s));
-+ wlen = mbsrtowcs (NULL, &str, -1, &s);
-+ if (wlen > 0)
-+ ++wlen;
-+ else {
-+ wlen = 0;
-+ memset (&s, 0, sizeof (s));
-+ }
-+ }
-+#endif
-
- if (entries != (menu_entry*) NULL) {
- register menu_entry* mp;
- for (mp = entries; count--; mp++) {
- if (mp->text[0] != '\0') {
-+ int len;
- #ifdef ENABLE_NLS
- mp->text = _(mp->text);
- #endif /* ENABLE_NLS */
- cp = strchr (mp->text,'&');
+ int source_easy_patterns = easy_patterns;
+ char *source_mask, *orig_mask, *dest_dir, *tmpdest;
+@@ -864,12 +865,20 @@ file_mask_dialog (FileOpContext *ctx, Fi
+ struct stat buf;
+ int val;
+ QuickDialog Quick_input;
+-
++ char *def_text;
+ g_return_val_if_fail (ctx != NULL, NULL);
++
++ def_text = g_strdup(def_text_orig);
++
+ #if 0
+ message (1, __FUNCTION__, "text = `%s' \n def_text = `%s'", text,
+ def_text);
+ #endif
++
+#ifdef UTF8
-+ if (SLsmg_Is_Unicode) {
-+ len = mbstrlen(mp->text) + 1;
-+ wlen += len;
-+ menu->max_entry_len = max (len - 1, menu->max_entry_len);
-+ } else
++ fix_utf8(def_text);
+#endif
-+ len = strlen (mp->text);
++
+ fmd_init_i18n (FALSE);
- if (cp != NULL && *(cp+1) != '\0') {
- mp->hot_key = tolower ((unsigned char) *(cp+1));
-- menu->max_entry_len = max ((int) (strlen (mp->text) - 1),
-- menu->max_entry_len);
-+ menu->max_entry_len = max (len - 1, menu->max_entry_len);
- } else {
-- menu->max_entry_len = max ((int) strlen (mp->text),
-- menu->max_entry_len);
-+ menu->max_entry_len = max (len, menu->max_entry_len);
- }
- }
- }
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-pld-developerfriendly.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-pl.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-utf8-look-and-feel.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-utf8.patch?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
