From owner-p4-projects@FreeBSD.ORG  Sun Dec  7 15:34:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 815D41065675; Sun,  7 Dec 2008 15:34:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B42D1065672
	for <perforce@FreeBSD.org>; Sun,  7 Dec 2008 15:34:40 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 20CF48FC14
	for <perforce@FreeBSD.org>; Sun,  7 Dec 2008 15:34:40 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7FYduE097808
	for <perforce@FreeBSD.org>; Sun, 7 Dec 2008 15:34:39 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7FYd8c097806
	for perforce@freebsd.org; Sun, 7 Dec 2008 15:34:39 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 15:34:39 GMT
Message-Id: <200812071534.mB7FYd8c097806@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 154259 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Dec 2008 15:34:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=154259

Change 154259 by ed@ed_mekker on 2008/12/07 15:34:28

	Argh! How hard is it to do it right? It seems we should not do
	wrapping on tabs after all.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#8 edit

Differences ...

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#8 (text+ko) ====

@@ -275,15 +275,13 @@
 
 	do {
 		/* Stop when we've reached the end of the line. */
-		if ((t->t_stateflags & TS_AUTOWRAP) == 0 &&
-		    t->t_cursor.tp_col == t->t_winsize.tp_col - 1)
+		if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1)
 			break;
 
 		teken_subr_regular_character(t, ' ');
 		
 		/* Tab marker set. */
-		if (t->t_stateflags & TS_WRAPPED ||
-		    teken_tab_isset(t, t->t_cursor.tp_col))
+		if (teken_tab_isset(t, t->t_cursor.tp_col))
 			ntabs--;
 	} while (ntabs > 0);
 }