Author: gotar Date: Tue Feb 3 21:53:30 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 4.6.2
---- Files affected:
SOURCES:
mc-no-ws-visible.patch (1.1 -> 1.2) , mc-pld-developerfriendly.patch (1.4 ->
1.5) , mc-pl.patch (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SOURCES/mc-no-ws-visible.patch
diff -u SOURCES/mc-no-ws-visible.patch:1.1 SOURCES/mc-no-ws-visible.patch:1.2
--- SOURCES/mc-no-ws-visible.patch:1.1 Tue May 6 09:30:21 2008
+++ SOURCES/mc-no-ws-visible.patch Tue Feb 3 22:53:24 2009
@@ -1,7 +1,7 @@
diff -urNp mc-4.6.2-pre1.orig/edit/editdraw.c mc-4.6.2-pre1/edit/editdraw.c
--- mc-4.6.2-pre1.orig/edit/editdraw.c 2007-08-27 14:06:03.000000000 +0200
+++ mc-4.6.2-pre1/edit/editdraw.c 2008-05-05 12:00:49.000000000 +0200
-@@ -51,7 +51,6 @@
+@@ -52,7 +52,6 @@
#define MOD_BOLD (1 << 9)
#define MOD_MARKED (1 << 10)
#define MOD_CURSOR (1 << 11)
@@ -9,7 +9,7 @@
#define FONT_OFFSET_X 0
#define FONT_OFFSET_Y 0
-@@ -244,27 +243,12 @@ print_to_widget (WEdit *edit, long row,
+@@ -265,27 +264,12 @@
color = 0;
}
@@ -40,9 +40,9 @@
- }
+ lowlevel_set_color (color);
}
-
- addch (textchar);
-@@ -272,8 +256,6 @@ print_to_widget (WEdit *edit, long row,
+ #ifdef UTF8
+ SLsmg_write_nwchars(&textchar, 1);
+@@ -296,8 +280,6 @@
}
}
@@ -51,19 +51,11 @@
/* b is a pointer to the beginning of the line */
static void
edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
-@@ -281,7 +263,7 @@ edit_draw_this_line (WEdit *edit, long b
- {
- static unsigned int line[MAX_LINE_LEN];
- unsigned int *p = line;
-- long m1 = 0, m2 = 0, q, c1, c2, tws;
-+ long m1 = 0, m2 = 0, q, c1, c2;
- int col, start_col_real;
- unsigned int c;
- int color;
-@@ -299,13 +281,6 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -323,14 +305,6 @@
eval_marks (edit, &m1, &m2);
if (row <= edit->total_lines - edit->start_line) {
+- long tws;
- if (use_colors && visible_tws) {
- tws = edit_eol (edit, b);
- while (tws > b && ((c = edit_get_byte (edit, tws - 1)) == ' '
@@ -72,17 +64,9 @@
- }
-
while (col <= end_col - edit->start_col) {
- *p = 0;
- if (q == edit->curs1)
-@@ -328,6 +303,7 @@ edit_draw_this_line (WEdit *edit, long b
- /* we don't use bg for mc - fg contains both */
- edit_get_syntax_color (edit, q, &color);
- *p |= color << 16;
-+ q++;
- switch (c) {
- case '\n':
- col = end_col - edit->start_col + 1; /* quit */
-@@ -335,38 +311,12 @@ edit_draw_this_line (WEdit *edit, long b
+ p->ch = 0;
+ p->style = 0;
+@@ -362,62 +336,12 @@
break;
case '\t':
i = TAB_SIZE - ((int) col % TAB_SIZE);
@@ -90,34 +74,58 @@
+ c = *(p++) & ~MOD_CURSOR;
col += i;
- if (use_colors && visible_tabs) {
-- c = (*p & ~MOD_CURSOR) | MOD_WHITESPACE;
+- c = (p->style & ~MOD_CURSOR) | MOD_WHITESPACE;
- if (i > 2) {
-- *(p++) |= '<' | MOD_WHITESPACE;
-- while (--i > 1)
-- *(p++) = c | '-';
-- *(p++) = c | '>';
+- p->ch = '<';
+- p->style |= MOD_WHITESPACE;
+- p++;
+- while (--i > 1) {
+- p->ch = '-';
+- p->style = c;
+- p++;
+- }
+- p->ch = '>';
+- p->style = c;
+- p++;
- } else if (i > 1) {
-- *(p++) |= '<' | MOD_WHITESPACE;
-- *(p++) = c | '>';
-- } else
-- *(p++) |= '>' | MOD_WHITESPACE;
+- p->ch = '<';
+- p->style |= MOD_WHITESPACE;
+- p++;
+- p->ch = '>';
+- p->style = c;
+- p++;
+- } else {
+- p->ch = '>';
+- p->style |= MOD_WHITESPACE;
+- p++;
+- }
- } else if (use_colors && visible_tws && q >= tws) {
-- *p |= '.' | MOD_WHITESPACE;
-- c = *(p++) & ~MOD_CURSOR;
-- while (--i)
-- *(p++) = c;
+- p->ch = '.';
+- p->style |= MOD_WHITESPACE;
+- c = p->style & ~MOD_CURSOR;
+- p++;
+- while (--i) {
+- p->ch = '.';
+- p->style = c;
+- p++;
+- }
- } else {
-- *p |= ' ';
-- c = *(p++) & ~MOD_CURSOR;
-- while (--i)
-- *(p++) = c;
+- p->ch = ' ';
+- c = p->style & ~MOD_CURSOR;
+- p++;
+- while (--i) {
+- p->ch = ' '; p->style = c;
+- p++;
+- }
- }
+ while (--i)
+ *(p++) = c;
break;
- case ' ':
- if (use_colors && visible_tws && q >= tws) {
-- *(p++) |= '.' | MOD_WHITESPACE;
+- p->ch = '.';
+- p->style |= MOD_WHITESPACE;
+- p++;
- col++;
- break;
- }
@@ -125,7 +133,7 @@
default:
c = convert_to_display_c (c);
-@@ -392,7 +342,6 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -468,7 +392,6 @@
col++;
break;
}
================================================================
Index: SOURCES/mc-pld-developerfriendly.patch
diff -u SOURCES/mc-pld-developerfriendly.patch:1.4
SOURCES/mc-pld-developerfriendly.patch:1.5
--- SOURCES/mc-pld-developerfriendly.patch:1.4 Wed Apr 16 20:02:12 2008
+++ SOURCES/mc-pld-developerfriendly.patch Tue Feb 3 22:53:24 2009
@@ -25,15 +25,26 @@
diff -urN mc-2006-02-24-22.org/syntax/Makefile.am
mc-2006-02-24-22/syntax/Makefile.am
--- mc-2006-02-24-22.org/syntax/Makefile.am 2006-01-30 18:01:58.000000000
+0100
+++ mc-2006-02-24-22/syntax/Makefile.am 2006-02-28 17:38:02.617073750
+0100
-@@ -7,6 +7,7 @@
+@@ -6,13 +6,14 @@
+ awk.syntax \
+ c.syntax \
changelog.syntax \
+- debian-changelog.syntax \
+- debian-control.syntax \
++ debian-changelog.syntax \
++ debian-control.syntax \
+ debian-description.syntax \
+- debian-sources-list.syntax \
++ debian-sources-list.syntax \
cs.syntax \
css.syntax \
+- cxx.syntax \
+ cvs-userlist.syntax \
++ cxx.syntax \
d.syntax \
diff.syntax \
dos.syntax \
-@@ -28,6 +29,7 @@
+@@ -35,6 +36,7 @@
pascal.syntax \
perl.syntax \
php.syntax \
@@ -44,15 +55,26 @@
diff -urN mc-2006-02-24-22.org/syntax/Makefile.in
mc-2006-02-24-22/syntax/Makefile.in
--- mc-2006-02-24-22.org/syntax/Makefile.in 2006-02-24 23:36:58.000000000
+0100
+++ mc-2006-02-24-22/syntax/Makefile.in 2006-02-28 17:38:24.266426750
+0100
-@@ -241,6 +241,7 @@
+@@ -229,13 +229,14 @@
+ assembler.syntax \
+ c.syntax \
changelog.syntax \
+- debian-changelog.syntax \
+- debian-control.syntax \
++ debian-changelog.syntax \
++ debian-control.syntax \
+ debian-description.syntax \
+- debian-sources-list.syntax \
++ debian-sources-list.syntax \
cs.syntax \
css.syntax \
+- cxx.syntax \
+ cvs-userlist.syntax \
++ cxx.syntax \
d.syntax \
diff.syntax \
dos.syntax \
-@@ -262,6 +263,7 @@
+@@ -258,6 +259,7 @@
pascal.syntax \
perl.syntax \
php.syntax \
================================================================
Index: SOURCES/mc-pl.patch
diff -u SOURCES/mc-pl.patch:1.9 SOURCES/mc-pl.patch:1.10
--- SOURCES/mc-pl.patch:1.9 Wed Apr 16 20:02:12 2008
+++ SOURCES/mc-pl.patch Tue Feb 3 22:53:25 2009
@@ -1,6 +1,6 @@
--- mc-2007-06-23-14/po/pl.po.orig 2007-06-23 16:43:07.000000000 +0200
+++ mc-2007-06-23-14/po/pl.po 2007-09-11 20:38:53.399189827 +0200
-@@ -69,7 +69,7 @@
+@@ -66,7 +66,7 @@
msgstr "Ostrze�enie"
msgid " File has hard-links. Detach before saving? "
@@ -9,7 +9,7 @@
msgid "&Yes"
msgstr "&Tak"
-@@ -81,7 +81,7 @@
+@@ -78,7 +78,7 @@
msgstr "&Anuluj"
msgid "The file has been modified in the meantime. Save anyway?"
@@ -18,7 +18,7 @@
msgid " Error writing to pipe: "
msgstr " B��d przy zapisie do potoku: "
-@@ -264,7 +264,7 @@
+@@ -261,7 +261,7 @@
msgstr " Ta opcja nie jest zaimplementowana. "
msgid " Copy to clipboard "
@@ -108,7 +108,7 @@
msgid " Filename:"
msgstr " Nazwa pliku:"
-@@ -1057,28 +1056,28 @@
+@@ -1057,25 +1056,25 @@
msgstr " Odznacz "
msgid "Extension file edit"
@@ -136,13 +136,9 @@
-msgstr "Lokalne"
+msgstr "&Lokalne"
- msgid "&Home"
--msgstr "Prywatne"
-+msgstr "&W�asne"
-
msgid "Syntax file edit"
msgstr "Modyfikacja pliku ze sk�adni�"
-@@ -1121,7 +1120,7 @@
+@@ -1118,7 +1117,7 @@
#, c-format
msgid "Link %s to:"
@@ -151,7 +147,7 @@
msgid " Link "
msgstr " Dowi�� "
-@@ -1132,26 +1131,26 @@
+@@ -1129,26 +1128,26 @@
#, c-format
msgid " symlink: %s "
@@ -184,7 +180,7 @@
#, c-format
msgid " Cannot chdir to %s "
-@@ -1280,7 +1279,7 @@
+@@ -1278,7 +1277,7 @@
"z %smc.ext lub napisa� samemu, opieraj�c si� na zawarto�ci tego pliku."
msgid " Copy "
@@ -193,7 +189,7 @@
msgid " Move "
msgstr " Przenie� "
-@@ -1307,16 +1306,16 @@
+@@ -1305,16 +1304,16 @@
"\n"
" Option Stable Symlinks will be disabled "
msgstr ""
@@ -213,7 +209,7 @@
" %s "
#, c-format
-@@ -1463,7 +1462,7 @@
+@@ -1461,7 +1460,7 @@
" Cannot copy cyclic symbolic link \n"
" `%s' "
msgstr ""
@@ -222,7 +218,7 @@
" '%s' "
#, c-format
-@@ -1710,7 +1709,7 @@
+@@ -1708,7 +1707,7 @@
msgstr "Zachowanie atrybut�w"
msgid "follow &Links"
@@ -231,7 +227,7 @@
msgid "to:"
msgstr "do:"
-@@ -1722,7 +1721,7 @@
+@@ -1720,7 +1719,7 @@
msgstr "W tle"
msgid "&Stable Symlinks"
@@ -240,7 +236,7 @@
msgid "&Dive into subdir if exists"
msgstr "Schodzenie do podkatalog�w"
-@@ -1754,10 +1753,10 @@
+@@ -1752,10 +1751,10 @@
msgstr "Filtruj"
msgid "&View - F3"
@@ -251,9 +247,9 @@
-msgstr "Edycja - F4"
+msgstr "Edytuj - F4"
- msgid "find Re&cursively"
- msgstr "znajd� Re&kurencyjnie"
-@@ -1888,6 +1887,8 @@
+ #, fuzzy
+ msgid "&Find recursively"
+@@ -1887,6 +1886,8 @@
"\n"
" Are you sure you want to remove this entry?"
msgstr ""
@@ -262,7 +258,7 @@
msgid ""
"\n"
-@@ -2164,13 +2165,13 @@
+@@ -2162,13 +2163,13 @@
msgstr "Widok filtrowany M-!"
msgid "&Edit F4"
@@ -279,7 +275,7 @@
msgid "&Link C-x l"
msgstr "Dowi�zanie C-x l"
-@@ -2182,13 +2183,13 @@
+@@ -2180,13 +2181,13 @@
msgstr "Modyf. dowi�z. C-x X-s"
msgid "ch&Own C-x o"
@@ -296,7 +292,7 @@
msgid "&Mkdir F7"
msgstr "Utw�rz katalog F7"
-@@ -2197,7 +2198,7 @@
+@@ -2195,7 +2196,7 @@
msgstr "Usu� F8"
msgid "&Quick cd M-c"
@@ -305,7 +301,7 @@
msgid "select &Group M-+"
msgstr "Zaznacz grup� M-+"
-@@ -2248,7 +2249,7 @@
+@@ -2246,7 +2247,7 @@
msgstr "&Odtw�rz pliki (tylko ext2fs)"
msgid "&Listing format edit"
@@ -314,16 +310,16 @@
msgid "Edit &extension file"
msgstr "Zmodyfikuj plik &rozszerze�"
-@@ -2450,7 +2451,7 @@
+@@ -2448,7 +2449,7 @@
msgstr "Wywo�uje podgl�d pliku"
msgid "Edits one file"
-msgstr "Modyfikuje plik"
+msgstr "Edytuje plik"
- msgid " Notice "
- msgstr " Uwaga "
-@@ -2598,10 +2599,10 @@
+ msgid "safe de&Lete"
+ msgstr "Bezpieczne usuwanie"
+@@ -2584,10 +2585,10 @@
msgstr "[urz]"
msgid "UP--DIR"
@@ -336,7 +332,7 @@
msgid "SUB-DIR"
msgstr "PODKATAL"
-@@ -2619,7 +2620,7 @@
+@@ -2605,7 +2606,7 @@
msgstr "CzasZ"
msgid "Permission"
@@ -345,7 +341,7 @@
msgid "Perm"
msgstr "Prawa"
-@@ -2637,24 +2638,24 @@
+@@ -2623,24 +2624,24 @@
msgstr "GID"
msgid "Owner"
@@ -378,7 +374,7 @@
msgid "<readlink failed>"
msgstr "<readlink() nie powiod�a si�>"
-@@ -2672,10 +2673,10 @@
+@@ -2658,10 +2659,10 @@
msgstr "Podgl."
msgid "Edit"
@@ -391,7 +387,7 @@
msgid "Mkdir"
msgstr "Utw�rz"
-@@ -2779,7 +2780,7 @@
+@@ -2765,7 +2766,7 @@
#, c-format
msgid "Copy \"%s\" directory to:"
@@ -400,7 +396,7 @@
#, c-format
msgid "Move \"%s\" directory to:"
-@@ -2862,10 +2863,10 @@
+@@ -2848,10 +2849,10 @@
msgstr " Menu u�ytkownika"
msgid "%b %e %H:%M"
@@ -411,9 +407,9 @@
-msgstr "%e.%m.%Y "
+msgstr "%d.%m.%Y "
- #, c-format
- msgid "%s is not a directory\n"
-@@ -2985,9 +2986,8 @@
+ msgid "(invalid)"
+ msgstr ""
+@@ -2974,9 +2975,8 @@
msgid " Goto Address "
msgstr " Przejd� pod adres "
@@ -424,7 +420,7 @@
msgid " Enter regexp:"
msgstr " Wprowad� wyra�enie regularne: "
-@@ -3406,10 +3406,10 @@
+@@ -3395,10 +3395,10 @@
msgstr "ftpfs: operacja CWD nie powiod�a si�."
msgid "ftpfs: couldn't resolve symlink"
@@ -437,11 +433,14 @@
#, c-format
msgid "ftpfs: Reading FTP directory %s... %s%s"
-@@ -3623,158 +3623,3 @@
+@@ -3612,176 +3612,3 @@
msgid "Changes to file lost"
msgstr "Utracono zmiany w pliku"
-
+-#~ msgid "&Home"
+-#~ msgstr "Prywatne"
+-
-#~ msgid "&Type"
-#~ msgstr "&Typ"
-
@@ -459,6 +458,21 @@
-
-#~ msgid "&Group"
-#~ msgstr "Grupa"
+-
+-#~ msgid "MC was unable to write ~/"
+-#~ msgstr "Nie mo�na zapisa� pliku ~/"
+-
+-#~ msgid " Notice "
+-#~ msgstr " Uwaga "
+-
+-#~ msgid ""
+-#~ " The Midnight Commander configuration files \n"
+-#~ " are now stored in the ~/.mc directory, the \n"
+-#~ " files have been moved now\n"
+-#~ msgstr ""
+-#~ " Pliki konfiguracyjne Midnight Commandera b�d� \n"
+-#~ " przechowywane w katalogu ~/.mc. Pliki zosta�y \n"
+-#~ " w�a�nie do niego przeniesione.\n"
-
-#~ msgid "%s bytes in %d files"
-#~ msgstr "%s bajt�w w %d plikach"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-no-ws-visible.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-pld-developerfriendly.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-pl.patch?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
