SOURCES: mc-4.6.2-utf8.patch - adjusted to changes made by mc-no-ws-visible...

[gotar]

Author: gotar                        Date: Tue Feb  3 22:28:05 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjusted to changes made by mc-no-ws-visible.patch 

---- Files affected:
SOURCES:
   mc-4.6.2-utf8.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mc-4.6.2-utf8.patch
diff -u SOURCES/mc-4.6.2-utf8.patch:1.1 SOURCES/mc-4.6.2-utf8.patch:1.2
--- SOURCES/mc-4.6.2-utf8.patch:1.1	Tue Feb  3 22:14:18 2009
+++ SOURCES/mc-4.6.2-utf8.patch	Tue Feb  3 23:27:59 2009
@@ -1977,7 +1977,7 @@
 index 86ea3f9..654f0b3 100644
 --- a/edit/editdraw.c
 +++ b/edit/editdraw.c
-@@ -71,11 +71,26 @@ static void status_string (WEdit * edit, char *s, int w)
+@@ -70,11 +70,26 @@
       * as decimal and as hex.
       */
      if (edit->curs1 < edit->last_byte) {
@@ -2007,7 +2007,7 @@
      } else {
  	strcpy (byte_str, "<EOF>");
      }
-@@ -207,11 +222,16 @@ void edit_scroll_screen_over_cursor (WEdit * edit)
+@@ -206,11 +221,16 @@
  #define lowlevel_set_color(x) attrset(MY_COLOR_PAIR(color))
  #endif
  
@@ -2026,7 +2026,7 @@
  
      int x = start_col_real + EDIT_TEXT_HORIZONTAL_OFFSET;
      int x1 = start_col + EDIT_TEXT_HORIZONTAL_OFFSET;
-@@ -225,9 +245,9 @@ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
+@@ -224,9 +244,9 @@
      edit_move (x1 + FONT_OFFSET_X, y + FONT_OFFSET_Y);
      p = line;
  
@@ -2038,7 +2038,7 @@
  	int color;
  
  	if (cols_to_skip) {
-@@ -236,9 +256,9 @@ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
+@@ -235,9 +255,9 @@
  	    continue;
  	}
  
@@ -2051,9 +2051,9 @@
  
  	if (style & MOD_ABNORMAL) {
  	    /* Non-printable - use black background */
-@@ -267,8 +287,11 @@ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
- 		lowlevel_set_color (color);
- 	    }
+@@ -251,8 +271,11 @@
+ 	} else {
+ 	    lowlevel_set_color (color);
  	}
 -
 +#ifdef UTF8
@@ -2064,7 +2064,7 @@
  	p++;
      }
  }
-@@ -280,11 +303,11 @@ static void
+@@ -262,11 +285,11 @@
  edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
  		     long end_col)
  {
@@ -2079,9 +2079,9 @@
      int color;
      int i;
  
-@@ -309,62 +332,88 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
- 	    }
+@@ -283,31 +306,33 @@
  
+ 	if (row <= edit->total_lines - edit->start_line) {
  	    while (col <= end_col - edit->start_col) {
 -		*p = 0;
 +		p->ch = 0;
@@ -2121,80 +2121,7 @@
  		    break;
  		case '\t':
  		    i = TAB_SIZE - ((int) col % TAB_SIZE);
- 		    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++;
-+			}
- 		    }
- 		    break;
- 		case ' ':
- 		    if (use_colors && visible_tws && q >= tws) {
--			*(p++) |= '.' | MOD_WHITESPACE;
-+			p->ch = '.';
-+			p->style |= MOD_WHITESPACE;
-+			p++;
- 			col++;
- 			break;
- 		    }
-@@ -374,22 +423,47 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
+@@ -322,22 +347,47 @@
  
  		    /* Caret notation for control characters */
  		    if (c < 32) {
@@ -2249,7 +2176,7 @@
  		    }
  		    col++;
  		    break;
-@@ -400,7 +474,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
+@@ -347,7 +397,7 @@
      } else {
  	start_col_real = start_col = 0;
      }
================================================================

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