From owner-p4-projects@FreeBSD.ORG  Mon Dec  8 08:16:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A3D7C1065675; Mon,  8 Dec 2008 08:16:05 +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 683891065672
	for <perforce@FreeBSD.org>; Mon,  8 Dec 2008 08:16:05 +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 577258FC22
	for <perforce@FreeBSD.org>; Mon,  8 Dec 2008 08:16:05 +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 mB88G5XF091582
	for <perforce@FreeBSD.org>; Mon, 8 Dec 2008 08:16:05 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB88G5vk091576
	for perforce@freebsd.org; Mon, 8 Dec 2008 08:16:05 GMT
	(envelope-from ed@FreeBSD.org)
Date: Mon, 8 Dec 2008 08:16:05 GMT
Message-Id: <200812080816.mB88G5vk091576@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 154320 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: Mon, 08 Dec 2008 08:16:05 -0000

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

Change 154320 by ed@ed_dull on 2008/12/08 08:15:18

	Unbreak Cons25-support:
	
	When I implemented RIS (Reset to Initial State), I accidentally
	replaced teken_subr_vertical_position_absolute() with code that
	should have been placed inside the RIS routine. I didn't really
	notice this, until I ran some Cons25-apps, which heavily use
	VPA. This means we are once again compatible with syscons.

Affected files ...

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

Differences ...

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

@@ -1074,8 +1074,8 @@
 teken_subr_vertical_position_absolute(teken_t *t, unsigned int row)
 {
 
-	t->t_curattr = t->t_saved_curattr = teken_defattr;
-	t->t_cursor.tp_row = t->t_cursor.tp_col = 0;
-	t->t_saved_cursor = t->t_cursor;
-	t->t_stateflags = TS_AUTOWRAP;
+	t->t_cursor.tp_row = teken_clamp(row + t->t_originreg.ts_begin,
+	    1, t->t_originreg.ts_end) - 1;
+	t->t_stateflags &= ~TS_WRAPPED;
+	teken_funcs_cursor(t);
 }