From owner-svn-src-user@FreeBSD.ORG  Tue Mar  9 21:07:33 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC2C21065675;
	Tue,  9 Mar 2010 21:07:33 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CB6918FC1A;
	Tue,  9 Mar 2010 21:07:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o29L7X0g030320;
	Tue, 9 Mar 2010 21:07:33 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o29L7XeT030318;
	Tue, 9 Mar 2010 21:07:33 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003092107.o29L7XeT030318@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 9 Mar 2010 21:07:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204929 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Mar 2010 21:07:33 -0000

Author: edwin
Date: Tue Mar  9 21:07:33 2010
New Revision: 204929
URL: http://svn.freebsd.org/changeset/base/204929

Log:
  Make -3 option more urgent than <month> <year> with regarding to
  the number of months printed.

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Tue Mar  9 21:06:17 2010	(r204928)
+++ user/edwin/ncal/ncal.c	Tue Mar  9 21:07:33 2010	(r204929)
@@ -338,8 +338,10 @@ main(int argc, char *argv[])
 		if (flag_easter)
 			usage();
 		flag_month = *argv++;
-		before = 0;
-		after = 0;
+		if (before == -1 && after == -1) {
+			before = 0;
+			after = 0;
+		}
 		m = strtol(flag_month, NULL, 10);
 		/* FALLTHROUGH */
 	case 1: