From owner-svn-src-all@FreeBSD.ORG  Thu Apr  2 01:46:19 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2231A737;
 Thu,  2 Apr 2015 01:46:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0DC95C14;
 Thu,  2 Apr 2015 01:46:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t321kITW040586;
 Thu, 2 Apr 2015 01:46:18 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t321kI40040584;
 Thu, 2 Apr 2015 01:46:18 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201504020146.t321kI40040584@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Thu, 2 Apr 2015 01:46:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280974 - head/sys/boot/forth
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Apr 2015 01:46:19 -0000

Author: dteske
Date: Thu Apr  2 01:46:17 2015
New Revision: 280974
URL: https://svnweb.freebsd.org/changeset/base/280974

Log:
  Use fg/b/me from screen.4th instead of literals
  
  MFC after:	3 days
  X-MFC-to:	stable/10

Modified:
  head/sys/boot/forth/menu.4th
  head/sys/boot/forth/version.4th

Modified: head/sys/boot/forth/menu.4th
==============================================================================
--- head/sys/boot/forth/menu.4th	Thu Apr  2 01:02:42 2015	(r280973)
+++ head/sys/boot/forth/menu.4th	Thu Apr  2 01:46:17 2015	(r280974)
@@ -216,13 +216,10 @@ also menu-infrastructure definitions
 	dup menuX @ swap at-xy
 
 	\ Print the value of menuidx
-	loader_color? if
-		." " (  )
-	then
+	loader_color? dup ( -- bool bool )
+	if b then
 	menuidx @ .
-	loader_color? if
-		." " (  )
-	then
+	if me then
 
 	\ Move the cursor forward 1 column
 	dup menuX @ 1+ swap at-xy

Modified: head/sys/boot/forth/version.4th
==============================================================================
--- head/sys/boot/forth/version.4th	Thu Apr  2 01:02:42 2015	(r280973)
+++ head/sys/boot/forth/version.4th	Thu Apr  2 01:46:17 2015	(r280974)
@@ -85,11 +85,10 @@ only forth definitions also version-proc
 	dup versionX @ swap - versionY @ at-xy
 
 	\ Print the version (optionally in cyan)
-	loader_color? if
-		." " type ." "
-	else
-		type
-	then
+	loader_color? dup ( -- bool bool )
+	if 6 fg then
+	type
+	if me then
 ;
 
 only forth definitions