From owner-svn-src-all@FreeBSD.ORG  Thu Jul 14 19:25:43 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10DEA1065678;
	Thu, 14 Jul 2011 19:25:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DC5C68FC16;
	Thu, 14 Jul 2011 19:25:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6EJPgAS042799;
	Thu, 14 Jul 2011 19:25:42 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6EJPgwP042796;
	Thu, 14 Jul 2011 19:25:42 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201107141925.p6EJPgwP042796@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 14 Jul 2011 19:25:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224038 - stable/7/contrib/top
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 14 Jul 2011 19:25:43 -0000

Author: jhb
Date: Thu Jul 14 19:25:42 2011
New Revision: 224038
URL: http://svn.freebsd.org/changeset/base/224038

Log:
  MFC 223870,223937:
  - Note that -a, -C, -H, -j, and -z are also toggles.
  - Add a leading space to the status messages output after toggling the
    'C' and 'H' flags at runtime.  This matches messages output for other
    toggles which leave the first column in the message blank to hold the
    cursor.

Modified:
  stable/7/contrib/top/top.X
  stable/7/contrib/top/top.c
Directory Properties:
  stable/7/contrib/top/   (props changed)

Modified: stable/7/contrib/top/top.X
==============================================================================
--- stable/7/contrib/top/top.X	Thu Jul 14 19:25:30 2011	(r224037)
+++ stable/7/contrib/top/top.X	Thu Jul 14 19:25:42 2011	(r224038)
@@ -197,11 +197,15 @@ a user to set his or her own defaults.  
 can also be specified in the environment variable
 .BR TOP .
 The options
+.BR \-a ,
+.BR \-C ,
+.BR \-H ,
 .BR \-I ,
+.BR \-j ,
 .BR \-S ,
-.BR \-u ,
+.BR \-t ,
 and
-.B \-t
+.B \-u
 are actually toggles.  A second specification of any of these options
 will negate the first.  Thus a user who has the environment variable
 .B TOP

Modified: stable/7/contrib/top/top.c
==============================================================================
--- stable/7/contrib/top/top.c	Thu Jul 14 19:25:30 2011	(r224037)
+++ stable/7/contrib/top/top.c	Thu Jul 14 19:25:42 2011	(r224038)
@@ -1013,7 +1013,7 @@ restart:
 			    case CMD_thrtog:
 				ps.thread = !ps.thread;
 				new_message(MT_standout | MT_delayed,
-				    "Displaying threads %s",
+				    " Displaying threads %s",
 				    ps.thread ? "separately" : "as a count");
 				header_text = format_header(uname_field);
 				reset_display();
@@ -1022,7 +1022,7 @@ restart:
 			    case CMD_wcputog:
 				ps.wcpu = !ps.wcpu;
 				new_message(MT_standout | MT_delayed,
-				    "Displaying %sCPU",
+				    " Displaying %sCPU",
 				    ps.wcpu ? "W" : "");
 				header_text = format_header(uname_field);
 				reset_display();