SOURCES: mc-utf8.patch - updated from fedora

arekm arekm at pld-linux.org
Mon Sep 10 19:31:10 CEST 2007


Author: arekm                        Date: Mon Sep 10 17:31:10 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated from fedora

---- Files affected:
SOURCES:
   mc-utf8.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/mc-utf8.patch
diff -u SOURCES/mc-utf8.patch:1.7 SOURCES/mc-utf8.patch:1.8
--- SOURCES/mc-utf8.patch:1.7	Mon Sep 10 19:18:24 2007
+++ SOURCES/mc-utf8.patch	Mon Sep 10 19:31:04 2007
@@ -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/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
  
      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/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)
  
  	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/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.
       */
@@ -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/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 ");
  
@@ -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/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;
@@ -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/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>
  
@@ -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/src/filegui.c.utf8	2006-01-30 18:01:58.000000000 +0100
++++ mc/src/filegui.c	2007-01-04 16:20:56.000000000 +0100
 @@ -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;
  		}
@@ -410,7 +410,7 @@
  	    }
  	}
  	l2 = max (l2, l);	/* last row */
-@@ -593,12 +594,12 @@
+@@ -593,12 +594,12 @@ init_replace (FileOpContext *ctx, enum O
  		    l = l1;
  		}
  		rd_widgets[i].xpos = l;
@@ -425,7 +425,7 @@
      }
  #endif				/* ENABLE_NLS */
  
-@@ -617,7 +618,7 @@
+@@ -617,7 +618,7 @@ init_replace (FileOpContext *ctx, enum O
  
      ADD_RD_LABEL (ui, 0,
  		  name_trunc (ui->replace_filename,
@@ -434,7 +434,7 @@
      ADD_RD_BUTTON (1);
  
      ADD_RD_BUTTON (2);
-@@ -804,36 +805,36 @@
+@@ -804,36 +805,36 @@ fmd_init_i18n (int force)
  	if (fmd_widgets[i].text[0] != '\0')
  	    fmd_widgets[i].text = _(fmd_widgets[i].text);
  
@@ -481,7 +481,7 @@
  
      chkbox_xpos (FMCB0);
      chkbox_xpos (FMCB21);
-@@ -855,7 +856,7 @@
+@@ -855,7 +856,7 @@ fmd_init_i18n (int force)
  
  char *
  file_mask_dialog (FileOpContext *ctx, FileOperation operation, const char *text,
@@ -490,7 +490,7 @@
  {
      int source_easy_patterns = easy_patterns;
      char *source_mask, *orig_mask, *dest_dir, *tmpdest;
-@@ -864,12 +865,20 @@
+@@ -864,12 +865,20 @@ file_mask_dialog (FileOpContext *ctx, Fi
      struct stat buf;
      int val;
      QuickDialog Quick_input;
@@ -512,7 +512,7 @@
      fmd_init_i18n (FALSE);
  
      /* Set up the result pointers */
-@@ -928,6 +937,7 @@
+@@ -928,6 +937,7 @@ file_mask_dialog (FileOpContext *ctx, Fi
      orig_mask = source_mask;
      if (!dest_dir || !*dest_dir) {
  	g_free (source_mask);
@@ -520,16 +520,16 @@
  	return dest_dir;
      }
      if (source_easy_patterns) {
-@@ -981,5 +991,6 @@
+@@ -981,5 +991,6 @@ file_mask_dialog (FileOpContext *ctx, Fi
      }
      if (val == B_USER)
  	*do_background = 1;
 +    g_free(def_text);
      return dest_dir;
  }
---- mc-2006-06-30-18/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-2006-06-30-18/src/panelize.c	2006-07-11 10:39:54.000000000 +0200
-@@ -127,7 +127,7 @@
+--- mc/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
++++ mc/src/panelize.c	2007-01-04 16:20:56.000000000 +0100
+@@ -127,7 +127,7 @@ init_panelize (void)
  	i = sizeof (panelize_but) / sizeof (panelize_but[0]);
  	while (i--) {
  	    panelize_but[i].text = _(panelize_but[i].text);
@@ -538,7 +538,7 @@
  	}
  	maxlen += 10;
  
-@@ -136,11 +136,11 @@
+@@ -136,11 +136,11 @@ init_panelize (void)
      panelize_cols = max (panelize_cols, maxlen);
  
      panelize_but[2].x =
@@ -553,9 +553,9 @@
  
  #endif				/* ENABLE_NLS */
  
---- mc-2006-06-30-18/src/slint.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-06-30-18/src/slint.c	2006-07-11 10:39:54.000000000 +0200
-@@ -141,7 +141,9 @@
+--- mc/src/slint.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/slint.c	2007-01-04 16:20:56.000000000 +0100
+@@ -141,7 +141,9 @@ void
  slang_init (void)
  {
      SLtt_get_terminfo ();
@@ -566,9 +566,9 @@
     /*
      * If the terminal in not in terminfo but begins with a well-known
      * string such as "linux" or "xterm" S-Lang will go on, but the
---- mc-2006-06-30-18/src/main.c.utf8	2006-05-15 17:46:14.000000000 +0200
-+++ mc-2006-06-30-18/src/main.c	2006-07-11 10:39:54.000000000 +0200
-@@ -704,7 +704,7 @@
+--- mc/src/main.c.utf8	2006-09-25 16:47:34.000000000 +0200
++++ mc/src/main.c	2007-01-04 16:20:56.000000000 +0100
+@@ -704,7 +704,7 @@ load_prompt (int fd, void *unused)
  	int prompt_len;
  
  	tmp_prompt = strip_ctrl_codes (subshell_prompt);
@@ -577,7 +577,7 @@
  
  	/* Check for prompts too big */
  	if (COLS > 8 && prompt_len > COLS - 8) {
-@@ -1612,7 +1612,11 @@
+@@ -1610,7 +1610,11 @@ update_xterm_title_path (void)
      if (xterm_flag && xterm_title) {
  	p = s = g_strdup (strip_home_and_password (current_panel->cwd));
  	do {
@@ -589,8 +589,8 @@
  		*s = '?';
  	} while (*++s);
  	fprintf (stdout, "\33]0;mc - %s\7", p);
---- mc-2006-06-30-18/src/view.c.utf8	2006-02-06 17:55:43.000000000 +0100
-+++ mc-2006-06-30-18/src/view.c	2006-07-11 10:39:54.000000000 +0200
+--- mc/src/view.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/src/view.c	2007-01-04 16:20:56.000000000 +0100
 @@ -43,6 +43,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -602,7 +602,7 @@
  #include "global.h"
  #include "tty.h"
  #include "cmd.h"		/* For view_other_cmd */
-@@ -1627,7 +1631,7 @@
+@@ -1639,7 +1643,7 @@ view_display_status (WView *view)
      hline (' ', width);
  
      file_label = _("File: %s");
@@ -611,7 +611,7 @@
      file_name = view->filename ? view->filename
  	: view->command ? view->command
  	: "";
-@@ -1895,6 +1899,12 @@
+@@ -1907,6 +1911,12 @@ view_display_text (WView * view)
      offset_type from;
      int c;
      struct hexedit_change_node *curr = view->change_list;
@@ -624,7 +624,7 @@
  
      view_display_clean (view);
      view_display_ruler (view);
-@@ -1907,8 +1917,37 @@
+@@ -1919,8 +1929,37 @@ view_display_text (WView * view)
  
      tty_setcolor (NORMAL_COLOR);
      for (row = 0, col = 0; row < height && (c = get_byte (view, from)) != -1; from++) {
@@ -663,7 +663,7 @@
  	    int c_prev;
  	    int c_next;
  
-@@ -1967,10 +2006,17 @@
+@@ -1985,10 +2024,17 @@ view_display_text (WView * view)
  	if (col >= view->dpy_text_column
  	    && col - view->dpy_text_column < width) {
  	    widget_move (view, top + row, left + (col - view->dpy_text_column));
@@ -681,9 +681,9 @@
  	}
  	col++;
  	tty_setcolor (NORMAL_COLOR);
---- mc-2006-06-30-18/src/screen.c.utf8	2006-02-09 02:59:16.000000000 +0100
-+++ mc-2006-06-30-18/src/screen.c	2006-07-11 10:39:54.000000000 +0200
-@@ -171,21 +171,56 @@
+--- mc/src/screen.c.utf8	2006-02-09 02:59:16.000000000 +0100
++++ mc/src/screen.c	2007-01-04 16:20:56.000000000 +0100
+@@ -171,21 +171,56 @@ add_permission_string (char *dest, int w
  static const char *
  string_file_name (file_entry *fe, int len)
  {
@@ -749,7 +749,7 @@
      }
  
      buffer[i] = 0;
-@@ -450,42 +485,6 @@
+@@ -450,42 +485,6 @@ static struct {
  { "dot",   1,  0, J_RIGHT,	" ",		0, string_dot,		   NULL },
  };
  
@@ -792,7 +792,7 @@
  static int
  file_compute_color (int attr, file_entry *fe)
  {
-@@ -539,14 +538,18 @@
+@@ -539,14 +538,18 @@ file_compute_color (int attr, file_entry
  
  /* Formats the file number file_index of panel in the buffer dest */
  static void
@@ -814,7 +814,7 @@
  
      length     = 0;
      empty_line = (file_index >= panel->count);
-@@ -564,34 +567,137 @@
+@@ -564,34 +567,137 @@ format_file (char *dest, int limit, WPan
  	    break;
  
  	if (format->string_fn){
@@ -966,7 +966,7 @@
  	} else {
              if (attr == SELECTED || attr == MARKED_SELECTED)
                  attrset (SELECTED_COLOR);
-@@ -614,7 +720,6 @@
+@@ -614,7 +720,6 @@ repaint_file (WPanel *panel, int file_in
  {
      int    second_column = 0;
      int	   width, offset;
@@ -974,7 +974,7 @@
  
      offset = 0;
      if (!isstatus && panel->split){
-@@ -643,7 +748,7 @@
+@@ -643,7 +748,7 @@ repaint_file (WPanel *panel, int file_in
  	    widget_move (&panel->widget, file_index - panel->top_file + 2, 1);
      }
  
@@ -983,7 +983,7 @@
  
      if (!isstatus && panel->split){
  	if (second_column)
-@@ -692,7 +797,7 @@
+@@ -692,7 +797,7 @@ display_mini_info (WPanel *panel)
  		   ngettext("%s in %d file", "%s in %d files", panel->marked),
  		   b_bytes, panel->marked);
  
@@ -992,7 +992,7 @@
  	    buffer [cols] = 0;
  	    p += 2;
  	} else
-@@ -1101,6 +1206,12 @@
+@@ -1101,6 +1206,12 @@ paint_frame (WPanel *panel)
      int  side, width;
  
      const char *txt;
@@ -1005,7 +1005,7 @@
      if (!panel->split)
  	adjust_top_file (panel);
  
-@@ -1125,16 +1236,38 @@
+@@ -1125,16 +1236,38 @@ paint_frame (WPanel *panel)
              if (format->string_fn){
                  txt = format->title;
  
@@ -1047,7 +1047,7 @@
  	    } else {
  		attrset (NORMAL_COLOR);
  		one_vline ();
-@@ -1891,11 +2024,24 @@
+@@ -1891,11 +2024,24 @@ do_search (WPanel *panel, int c_code)
      int i;
      int wrapped = 0;
      int found;
@@ -1074,7 +1074,7 @@
      } else {
  	if (c_code && l < sizeof (panel->search_buffer)) {
  	    panel->search_buffer[l] = c_code;
-@@ -1904,6 +2050,14 @@
+@@ -1904,6 +2050,14 @@ do_search (WPanel *panel, int c_code)
  	}
      }
  
@@ -1089,7 +1089,7 @@
      found = 0;
      for (i = panel->selected; !wrapped || i != panel->selected; i++) {
  	if (i >= panel->count) {
-@@ -1914,9 +2068,9 @@
+@@ -1914,9 +2068,9 @@ do_search (WPanel *panel, int c_code)
  	}
  	if (panel->
  	    case_sensitive
@@ -1101,7 +1101,7 @@
  	    unselect_item (panel);
  	    panel->selected = i;
  	    select_item (panel);
-@@ -1925,7 +2079,7 @@
+@@ -1925,7 +2079,7 @@ do_search (WPanel *panel, int c_code)
  	}
      }
      if (!found)
@@ -1110,9 +1110,9 @@
  
      paint_panel (panel);
  }
---- mc-2006-06-30-18/src/widget.h.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-06-30-18/src/widget.h	2006-07-11 10:39:54.000000000 +0200
-@@ -22,6 +22,7 @@
+--- mc/src/widget.h.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/widget.h	2007-01-04 16:20:56.000000000 +0100
+@@ -22,6 +22,7 @@ typedef struct WButton {
      char *text;			/* text of button */
      int hotkey;			/* hot KEY */
      int hotpos;			/* offset hot KEY char in text */
@@ -1120,7 +1120,7 @@
      bcback callback;		/* Callback function */
  } WButton;
  
-@@ -42,6 +43,7 @@
+@@ -42,6 +43,7 @@ typedef struct WCheck {
      char *text;			/* text of check button */
      int hotkey;                 /* hot KEY */
      int hotpos;			/* offset hot KEY char in text */
@@ -1128,7 +1128,7 @@
  } WCheck;
  
  typedef struct WGauge {
-@@ -57,16 +59,20 @@
+@@ -57,16 +59,20 @@ char *show_hist (GList *history, int wid
  
  typedef struct {
      Widget widget;
@@ -1154,8 +1154,8 @@
      GList *history;		/* The history */
      int  need_push;		/* need to push the current Input on hist? */
      char **completions;		/* Possible completions array */
---- mc-2006-06-30-18/src/tty.h.utf8	2006-05-15 17:46:20.000000000 +0200
-+++ mc-2006-06-30-18/src/tty.h	2006-07-11 10:39:54.000000000 +0200
+--- mc/src/tty.h.utf8	2006-05-15 17:46:20.000000000 +0200
++++ mc/src/tty.h	2007-01-04 16:20:56.000000000 +0100
 @@ -8,6 +8,8 @@
      of ifdefs in the other files small.
   */
@@ -1165,9 +1165,9 @@
  #ifdef HAVE_SLANG
  #   include "myslang.h"
  #endif
---- mc-2006-06-30-18/src/hotlist.c.utf8	2006-02-15 17:19:26.000000000 +0100
-+++ mc-2006-06-30-18/src/hotlist.c	2006-07-11 10:39:54.000000000 +0200
-@@ -565,7 +565,7 @@
+--- mc/src/hotlist.c.utf8	2006-08-08 19:55:46.000000000 +0200
++++ mc/src/hotlist.c	2007-01-04 16:20:56.000000000 +0100
+@@ -563,7 +563,7 @@ init_i18n_stuff(int list_type, int cols)
  
  			row = hotlist_but [i].y;
  			++count [row];
@@ -1176,7 +1176,7 @@
  			if (hotlist_but [i].flags == DEFPUSH_BUTTON)
  				len [row] += 2;
  		}
-@@ -590,12 +590,12 @@
+@@ -588,12 +588,12 @@ init_i18n_stuff(int list_type, int cols)
  				/* not first int the row */
  				if (!strcmp (hotlist_but [i].text, cancel_but))
  					hotlist_but [i].x = 
@@ -1191,7 +1191,7 @@
  				+ (hotlist_but [i].flags == DEFPUSH_BUTTON ? 5 : 3);
  		}
  	}
-@@ -836,7 +836,7 @@
+@@ -834,7 +834,7 @@ static void add_widgets_i18n(QuickWidget
  	for (i = 0; i < 3; i++)
  	{
  		qw [i].text = _(qw [i].text);
@@ -1200,7 +1200,7 @@
  	}
  	space = (len - 4 - l[0] - l[1] - l[2]) / 4;
  
-@@ -885,7 +885,7 @@
+@@ -883,7 +883,7 @@ add_new_entry_input (const char *header,
  
      msglen(text1, &lines1, &cols1);
      msglen(text2, &lines2, &cols2);
@@ -1209,7 +1209,7 @@
      len = max (len, cols2) + 4;
      len = max (len, 64);
  
-@@ -981,7 +981,7 @@
+@@ -979,7 +979,7 @@ add_new_group_input (const char *header,
  #endif /* ENABLE_NLS */
  
      msglen (label, &lines, &cols);
@@ -1218,7 +1218,7 @@
      len = max (len, 64);
  
  #ifdef ENABLE_NLS
-@@ -1037,7 +1037,7 @@
+@@ -1035,7 +1035,7 @@ void add2hotlist_cmd (void)
  {
      char *prompt, *label;
      const char *cp = _("Label for \"%s\":");
@@ -1227,9 +1227,9 @@
      char *label_string = g_strdup (current_panel->cwd);
  
      strip_password (label_string, 1);
---- mc-2006-06-30-18/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
-+++ mc-2006-06-30-18/src/help.c	2006-07-11 10:39:54.000000000 +0200
-@@ -449,10 +449,28 @@
+--- mc/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
++++ mc/src/help.c	2007-01-04 16:20:56.000000000 +0100
+@@ -449,10 +449,28 @@ static void help_show (Dlg_head *h, cons
  #ifndef HAVE_SLANG
  			addch (acs_map [c]);
  #else
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mc-utf8.patch?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list