[Pkg-mc-commits] r166 - in trunk/debian: . patches patches/utf8

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-07-21 20:43:04 +0000 (Mon, 21 Jul 2008)
New Revision: 166

Added:
   trunk/debian/patches/utf8/mc-utf8-unbreak-visible-ws.patch
   trunk/debian/tdmc/
Modified:
   trunk/debian/changelog
   trunk/debian/patches/all.series
Log:
Fix another bug


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-28 15:15:26 UTC (rev 165)
+++ trunk/debian/changelog	2008-07-21 20:43:04 UTC (rev 166)
@@ -8,8 +8,11 @@
     between me and the submitter. (Closes: 487611)
   * Highlight also .inc files as php if they are written in php. 
     (Closes: 487936)
+  * Add tdmc_tar as a extfs which has more features as plain tar 
+    (Closes: #123456, #123345)
+  * Enabled whitespace feature again. (Closes: #488465) 
 
- -- Patrick Winnertz <winnie at debian.org>  Sat, 28 Jun 2008 17:10:15 +0200
+ -- Patrick Winnertz <winnie at debian.org>  Mon, 21 Jul 2008 22:40:58 +0200
 
 mc (2:4.6.2~git20080311-2) unstable; urgency=low
 

Modified: trunk/debian/patches/all.series
===================================================================
--- trunk/debian/patches/all.series	2008-06-28 15:15:26 UTC (rev 165)
+++ trunk/debian/patches/all.series	2008-07-21 20:43:04 UTC (rev 166)
@@ -36,6 +36,7 @@
 utf8/mc-utf8-nlink.patch
 utf8/mc-utf8-look-and-feel.patch
 utf8/recode.patch
+utf8/mc-utf8-unbreak-visible-ws.patch
 utf8/tty.patch
 vfs/01_ftpfs_symlink.patch
 vfs/02_ignore_ftp_chmod_error.patch

Added: trunk/debian/patches/utf8/mc-utf8-unbreak-visible-ws.patch
===================================================================
--- trunk/debian/patches/utf8/mc-utf8-unbreak-visible-ws.patch	                        (rev 0)
+++ trunk/debian/patches/utf8/mc-utf8-unbreak-visible-ws.patch	2008-07-21 20:43:04 UTC (rev 166)
@@ -0,0 +1,75 @@
+--- mc/edit/editdraw.c.orig	2008-06-28 21:54:42.000000000 +0400
++++ mc/edit/editdraw.c	2008-06-28 22:53:40.000000000 +0400
+@@ -359,17 +359,63 @@
+ 		    p->ch = ' ';
+ 		    p++;
+ 		    break;
+- 		case '\t':
+- 		    i = TAB_SIZE - ((int) col % TAB_SIZE);
+-		    p->ch = ' ';
+-		    c = p->style & ~MOD_CURSOR;
+-		    p++;
+- 		    col += i;
+-		    while (--i) {
+-			p->ch = ' '; p->style = c;
++		case '\t':
++		    i = TAB_SIZE - ((int) col % TAB_SIZE);
++		    col += i;
++		    if (use_colors && visible_tabs) {
++			c = (p->style & ~MOD_CURSOR) | MOD_WHITESPACE;
++			if (i > 2) {
++			    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->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->ch = '.';
++			p->style |= MOD_WHITESPACE;
++			c = p->style & ~MOD_CURSOR;
++			p++;
++			while (--i) {
++			    p->ch = '.';
++			    p->style = c;
++			    p++;
++			}
++		    } else {
++			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->ch = '.';
++			p->style |= MOD_WHITESPACE;
++			p++;
++			col++;
++			break;
+ 		    }
+- 		    break;
+ 		    /* fallthrough */
+ 		default:
+ 		    c = convert_to_display_c (c);