rpms/mc/devel .cvsignore, 1.27, 1.28 mc-utf8.patch, 1.22, 1.23 mc.spec, 1.105, 1.106 sources, 1.33, 1.34
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 10 11:43:58 UTC 2006
Author: jnovy
Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17293
Modified Files:
.cvsignore mc-utf8.patch mc.spec sources
Log Message:
- update to the new CVS snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 13 Sep 2006 07:56:27 -0000 1.27
+++ .cvsignore 10 Oct 2006 11:43:56 -0000 1.28
@@ -2,3 +2,4 @@
mc-2006-06-30-18.tar.gz
mc-2006-08-12-18.tar.gz
mc-2006-09-12-21.tar.gz
+mc-2006-09-25-14.tar.gz
mc-utf8.patch:
acinclude.m4 | 16 -
edit/edit-widget.h | 16 +
edit/edit.c | 267 +++++++++++++++++++--------
edit/edit.h | 39 +++
edit/editcmd.c | 523 +++++++++++++++++++++++++++++++++++++++++++++--------
edit/editdraw.c | 113 +++++++----
edit/editkeys.c | 29 ++
edit/editwidget.c | 3
edit/wordproc.c | 79 ++++++--
src/achown.c | 6
src/boxes.c | 50 ++---
src/dialog.c | 2
src/file.c | 13 +
src/filegui.c | 47 ++--
src/find.c | 12 -
src/help.c | 24 ++
src/hotlist.c | 14 -
src/layout.c | 26 +-
src/learn.c | 2
src/main.c | 6
src/menu.c | 122 +++++++++++-
src/menu.h | 2
src/myslang.h | 10 +
src/option.c | 20 +-
src/panelize.c | 8
src/screen.c | 300 +++++++++++++++++++++++-------
src/slint.c | 4
src/tty.c | 10 -
src/tty.h | 2
src/util.c | 349 ++++++++++++++++++++++++++++++++---
src/util.h | 7
src/view.c | 50 ++++-
src/widget.c | 371 ++++++++++++++++++++++++++++++-------
src/widget.h | 16 +
src/wtools.c | 14 -
35 files changed, 2070 insertions(+), 502 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.22 -r 1.23 mc-utf8.patch
Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mc-utf8.patch 11 Jul 2006 12:56:44 -0000 1.22
+++ mc-utf8.patch 10 Oct 2006 11:43:56 -0000 1.23
@@ -1,6 +1,6 @@
---- mc-2006-06-30-18/acinclude.m4.utf8 2006-06-30 20:32:27.000000000 +0200
-+++ mc-2006-06-30-18/acinclude.m4 2006-07-11 10:39:54.000000000 +0200
-@@ -443,14 +443,14 @@
+--- mc-2006-09-25-14/acinclude.m4.utf8 2006-09-09 00:35:29.000000000 +0200
++++ mc-2006-09-25-14/acinclude.m4 2006-10-10 09:35:14.000000000 +0200
+@@ -399,14 +399,14 @@ AC_DEFUN([MC_WITH_SLANG], [
fi
dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
@@ -23,9 +23,9 @@
if test x$with_screen = xslang; then
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
---- mc-2006-06-30-18/src/layout.c.utf8 2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-06-30-18/src/layout.c 2006-07-11 10:39:54.000000000 +0200
-@@ -369,36 +369,36 @@
+--- mc-2006-09-25-14/src/layout.c.utf8 2006-09-25 16:47:33.000000000 +0200
++++ mc-2006-09-25-14/src/layout.c 2006-10-10 09:35:14.000000000 +0200
+@@ -366,36 +366,36 @@ init_layout (void)
while (i--) {
s_split_direction[i] = _(s_split_direction[i]);
@@ -69,7 +69,7 @@
if (l1 > second_width)
second_width = l1;
}
-@@ -412,14 +412,14 @@
+@@ -409,14 +409,14 @@ init_layout (void)
*
* Now the last thing to do - properly space buttons...
*/
@@ -89,7 +89,7 @@
i18n_layt_flag = 1;
}
-@@ -687,7 +687,7 @@
+@@ -684,7 +684,7 @@ setup_panels (void)
panel_do_cols (0);
panel_do_cols (1);
@@ -98,9 +98,9 @@
widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
---- mc-2006-06-30-18/src/tty.c.utf8 2006-05-23 16:20:39.000000000 +0200
-+++ mc-2006-06-30-18/src/tty.c 2006-07-11 10:39:54.000000000 +0200
-@@ -134,10 +134,12 @@
+--- mc-2006-09-25-14/src/tty.c.utf8 2006-05-23 16:20:39.000000000 +0200
++++ mc-2006-09-25-14/src/tty.c 2006-10-10 09:35:14.000000000 +0200
+@@ -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.
*/
@@ -117,9 +117,9 @@
#else
addch(c);
#endif
---- mc-2006-06-30-18/src/option.c.utf8 2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-06-30-18/src/option.c 2006-07-11 10:39:54.000000000 +0200
-@@ -123,12 +123,12 @@
+--- mc-2006-09-25-14/src/option.c.utf8 2006-02-28 18:44:28.000000000 +0100
++++ mc-2006-09-25-14/src/option.c 2006-10-10 09:35:14.000000000 +0200
+@@ -123,12 +123,12 @@ init_configure (void)
title2 = _(" Pause after run... ");
title3 = _(" Other options ");
@@ -135,7 +135,7 @@
if (i >= OTHER_OPTIONS) {
if (l1 > first_width)
first_width = l1;
-@@ -141,23 +141,23 @@
+@@ -141,23 +141,23 @@ init_configure (void)
i = PAUSE_OPTIONS;
while (i--) {
pause_options[i] = _(pause_options[i]);
@@ -166,9 +166,9 @@
i18n_config_flag = 1;
}
---- mc-2006-06-30-18/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100
-+++ mc-2006-06-30-18/src/menu.h 2006-07-11 10:39:54.000000000 +0200
-@@ -21,6 +21,8 @@
+--- mc-2006-09-25-14/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100
++++ mc-2006-09-25-14/src/menu.h 2006-10-10 09:35:14.000000000 +0200
+@@ -21,6 +21,8 @@ typedef struct Menu {
menu_entry *entries;
int start_x; /* position relative to menubar start */
char *help_node;
@@ -177,8 +177,8 @@
} Menu;
extern int menubar_visible;
---- mc-2006-06-30-18/src/menu.c.utf8 2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-06-30-18/src/menu.c 2006-07-11 10:39:54.000000000 +0200
+--- mc-2006-09-25-14/src/menu.c.utf8 2005-09-06 22:36:23.000000000 +0200
++++ mc-2006-09-25-14/src/menu.c 2006-10-10 09:35:14.000000000 +0200
@@ -22,6 +22,7 @@
#include <string.h>
@@ -187,7 +187,7 @@
#include "global.h"
#include "tty.h"
-@@ -53,35 +54,95 @@
+@@ -53,35 +54,95 @@ create_menu (const char *name, menu_entr
{
Menu *menu;
const char *cp;
@@ -289,7 +289,7 @@
menu->start_x = 0;
menu->help_node = g_strdup (help_node);
return menu;
-@@ -112,8 +173,26 @@
+@@ -112,8 +173,26 @@ static void menubar_paint_idx (WMenu *me
const char *text;
addch((unsigned char)menu->entries [idx].first_letter);
@@ -318,7 +318,7 @@
if (*text != '&')
addch(*text);
else {
-@@ -122,7 +201,7 @@
+@@ -122,7 +201,7 @@ static void menubar_paint_idx (WMenu *me
addch(*(++text));
attrset(color);
}
@@ -327,7 +327,7 @@
}
widget_move (&menubar->widget, y, x + 1);
}
-@@ -168,6 +247,12 @@
+@@ -168,6 +247,12 @@ static void menubar_draw (WMenu *menubar
if (menubar->active)
attrset(i == menubar->selected?MENU_SELECTED_COLOR:SELECTED_COLOR);
widget_move (&menubar->widget, 0, menubar->menu [i]->start_x);
@@ -340,7 +340,7 @@
tty_printf ("%s", menubar->menu [i]->name);
}
-@@ -493,7 +578,13 @@
+@@ -493,7 +578,13 @@ menubar_arrange(WMenu* menubar)
for (i = 0; i < items; i++)
{
@@ -355,7 +355,7 @@
menubar->menu[i]->start_x = start_x;
start_x += len + gap;
}
-@@ -506,7 +597,13 @@
+@@ -506,7 +597,13 @@ menubar_arrange(WMenu* menubar)
for (i = 0; i < items; i++)
{
/* preserve length here, to be used below */
@@ -370,7 +370,7 @@
}
gap /= (items - 1);
-@@ -530,6 +627,9 @@
+@@ -530,6 +627,9 @@ menubar_arrange(WMenu* menubar)
void
destroy_menu (Menu *menu)
{
@@ -380,8 +380,8 @@
g_free (menu->name);
g_free (menu->help_node);
g_free (menu);
---- mc-2006-06-30-18/src/filegui.c.utf8 2006-01-30 18:01:58.000000000 +0100
-+++ mc-2006-06-30-18/src/filegui.c 2006-07-11 10:39:54.000000000 +0200
+--- mc-2006-09-25-14/src/filegui.c.utf8 2006-01-30 18:01:58.000000000 +0100
++++ mc-2006-09-25-14/src/filegui.c 2006-10-10 09:35:14.000000000 +0200
@@ -65,6 +65,7 @@
#include "filegui.h"
#include "key.h" /* get_event */
@@ -390,7 +390,7 @@
/* }}} */
-@@ -563,8 +564,8 @@
+@@ -563,8 +564,8 @@ init_replace (FileOpContext *ctx, enum O
* longest of "Overwrite..." labels
* (assume "Target date..." are short enough)
*/
@@ -401,7 +401,7 @@
/* longest of button rows */
i = sizeof (rd_widgets) / sizeof (rd_widgets[0]);
-@@ -575,7 +576,7 @@
+@@ -575,7 +576,7 @@ init_replace (FileOpContext *ctx, enum O
l2 = max (l2, l);
l = 0;
}
[...2077 lines suppressed...]
*/
static long
@@ -4944,7 +4944,7 @@
}
/* is called whenever a modification is made by one of the four routines below */
-@@ -827,7 +943,7 @@
+@@ -827,7 +943,7 @@ static inline void edit_modification (WE
*/
void
@@ -4953,7 +4953,7 @@
{
/* check if file has grown to large */
if (edit->last_byte >= SIZE_LIMIT)
-@@ -865,12 +981,11 @@
+@@ -865,12 +981,11 @@ edit_insert (WEdit *edit, int c)
/* add a new buffer if we've reached the end of the last one */
if (!(edit->curs1 & M_EDIT_BUF_SIZE))
edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] =
@@ -4969,7 +4969,7 @@
/* update file length */
edit->last_byte++;
-@@ -881,7 +996,7 @@
+@@ -881,7 +996,7 @@ edit_insert (WEdit *edit, int c)
/* same as edit_insert and move left */
@@ -4978,7 +4978,7 @@
{
if (edit->last_byte >= SIZE_LIMIT)
return;
-@@ -904,7 +1019,7 @@
+@@ -904,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in
edit->last_get_rule += (edit->last_get_rule >= edit->curs1);
if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -4987,7 +4987,7 @@
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
edit->last_byte++;
-@@ -914,7 +1029,7 @@
+@@ -914,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in
int edit_delete (WEdit * edit)
{
@@ -4996,7 +4996,7 @@
if (!edit->curs2)
return 0;
-@@ -938,7 +1053,7 @@
+@@ -938,7 +1053,7 @@ int edit_delete (WEdit * edit)
edit->total_lines--;
edit->force |= REDRAW_AFTER_CURSOR;
}
@@ -5005,7 +5005,7 @@
if (edit->curs1 < edit->start_display) {
edit->start_display--;
if (p == '\n')
-@@ -952,7 +1067,7 @@
+@@ -952,7 +1067,7 @@ int edit_delete (WEdit * edit)
static int
edit_backspace (WEdit * edit)
{
@@ -5014,7 +5014,7 @@
if (!edit->curs1)
return 0;
-@@ -976,7 +1091,7 @@
+@@ -976,7 +1091,7 @@ edit_backspace (WEdit * edit)
edit->total_lines--;
edit->force |= REDRAW_AFTER_CURSOR;
}
@@ -5023,7 +5023,7 @@
if (edit->curs1 < edit->start_display) {
edit->start_display--;
-@@ -989,10 +1104,18 @@
+@@ -989,10 +1104,18 @@ edit_backspace (WEdit * edit)
#ifdef FAST_MOVE_CURSOR
@@ -5043,7 +5043,7 @@
edit->curs_line--;
next -= (unsigned long) dest;
n -= next;
-@@ -1005,7 +1128,7 @@
+@@ -1005,7 +1128,7 @@ int
edit_move_backward_lots (WEdit *edit, long increment)
{
int r, s, t;
@@ -5052,7 +5052,7 @@
if (increment > edit->curs1)
increment = edit->curs1;
-@@ -1045,7 +1168,7 @@
+@@ -1045,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
else
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -5061,7 +5061,7 @@
} else {
g_free (p);
}
-@@ -1083,7 +1206,7 @@
+@@ -1083,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
else
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -5070,7 +5070,7 @@
} else {
g_free (p);
}
-@@ -1115,7 +1238,7 @@
+@@ -1115,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long
c = edit_get_byte (edit, edit->curs1 - 1);
if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -5079,7 +5079,7 @@
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
edit->curs2++;
c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE];
-@@ -1140,7 +1263,7 @@
+@@ -1140,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long
c = edit_get_byte (edit, edit->curs1);
if (!(edit->curs1 & M_EDIT_BUF_SIZE))
@@ -5088,7 +5088,7 @@
edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->curs1 & M_EDIT_BUF_SIZE] = c;
edit->curs1++;
c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
-@@ -1247,7 +1370,7 @@
+@@ -1247,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l
q = edit->last_byte + 2;
for (col = 0, p = current; p < q; p++) {
@@ -5097,7 +5097,7 @@
if (cols != -10) {
if (col == cols)
return p;
-@@ -1265,7 +1388,7 @@
+@@ -1265,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l
} else if (c < 32 || c == 127)
col += 2; /* Caret notation for control characters */
else
@@ -5106,7 +5106,7 @@
}
return col;
}
-@@ -1398,7 +1521,7 @@
+@@ -1398,7 +1521,7 @@ static int
is_blank (WEdit *edit, long offset)
{
long s, f;
@@ -5115,7 +5115,7 @@
s = edit_bol (edit, offset);
f = edit_eol (edit, offset) - 1;
while (s <= f) {
-@@ -1770,13 +1893,13 @@
+@@ -1770,13 +1893,13 @@ static void edit_left_delete_word (WEdit
static void
edit_do_undo (WEdit * edit)
{
@@ -5132,7 +5132,7 @@
case STACK_BOTTOM:
goto done_undo;
case CURS_RIGHT:
-@@ -1797,31 +1920,33 @@
+@@ -1797,31 +1920,33 @@ edit_do_undo (WEdit * edit)
case COLUMN_OFF:
column_highlighting = 0;
break;
@@ -5179,7 +5179,7 @@
edit_update_curs_row (edit);
done_undo:;
-@@ -2101,7 +2226,7 @@
+@@ -2101,7 +2226,7 @@ static void edit_goto_matching_bracket (
* passed as -1. Commands are executed, and char_for_insertion is
* inserted at the cursor.
*/
@@ -5188,7 +5188,7 @@
{
if (command == CK_Begin_Record_Macro) {
edit->macro_i = 0;
-@@ -2136,7 +2261,7 @@
+@@ -2136,7 +2261,7 @@ static const char * const shell_cmd[] =
all of them. It also does not check for the Undo command.
*/
void
@@ -5197,7 +5197,7 @@
{
edit->force |= REDRAW_LINE;
-@@ -2169,7 +2294,7 @@
+@@ -2169,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma
}
/* An ordinary key press */
Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mc.spec 1 Oct 2006 21:17:45 -0000 1.105
+++ mc.spec 10 Oct 2006 11:43:56 -0000 1.106
@@ -1,9 +1,9 @@
-%define date 2006-09-12-21
+%define date 2006-09-25-14
Summary: User-friendly text console file manager and visual shell
Name: mc
Version: 4.6.1a
-Release: 30%{?dist}
+Release: 31%{?dist}
Epoch: 1
License: GPL
Group: System Environment/Shells
@@ -198,6 +198,9 @@
%dir %{_sysconfdir}/mc
%changelog
+* Tue Oct 10 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-31
+- update to new CVS snapshot
+
* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> 4.6.1a-30
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 13 Sep 2006 07:56:27 -0000 1.33
+++ sources 10 Oct 2006 11:43:56 -0000 1.34
@@ -1 +1 @@
-bf226b806c3081d26eab068a3460000d mc-2006-09-12-21.tar.gz
+166770dd758526b2a013a6978a8bb54a mc-2006-09-25-14.tar.gz
More information about the fedora-cvs-commits
mailing list