svn commit: r359419 - head/usr.bin/ncal

[Rodney W. Grimes]

> Author: grog
> Date: Sun Mar 29 04:18:27 2020
> New Revision: 359419
> URL: https://svnweb.freebsd.org/changeset/base/359419
> 
> Log:
>   Remove spurious transition from Julian to Gregorian for country
>   "Latin".
>   
>   Arguably the entire -p option should be removed.  It shows only a few
>   countries, and it doesn't have any relationship with the rest of the
>   program.

This commit message and the diff below do not seem to match very well.
Is this actually what you intended to commit?

>   
>   PR:		244801
>   Submitted by:	grog@
>   Reported by:	Hamid Ali
> 
> Modified:
>   head/usr.bin/ncal/ncal.c
> 
> Modified: head/usr.bin/ncal/ncal.c
> ==============================================================================
> --- head/usr.bin/ncal/ncal.c	Sun Mar 29 04:14:57 2020	(r359418)
> +++ head/usr.bin/ncal/ncal.c	Sun Mar 29 04:18:27 2020	(r359419)
> @@ -95,7 +95,6 @@ static struct djswitch {
>  	{"IT", "Italy",         {1582, 10,  4}},
>  	{"JP", "Japan",         {1918, 12, 18}},
>  	{"LI", "Lithuania",     {1918,  2,  1}},
> -	{"LN", "Latin",         {9999, 05, 31}},
>  	{"LU", "Luxembourg",    {1582, 12, 14}},
>  	{"LV", "Latvia",        {1918,  2,  1}},
>  	{"NL", "Netherlands",   {1582, 12, 14}},
> @@ -580,7 +579,7 @@ printeaster(int y, int julian, int orthodox)
>  			(y)++;		\
>  		}
>  #define	M2Y(m)	((m) / 12)
> -#define	M2M(m)	(1 + (m) % 12) 
> +#define	M2M(m)	(1 + (m) % 12)
>  
>  /* Print all months for the period in the range [ before .. y-m .. after ]. */
>  static void
> @@ -925,7 +924,7 @@ mkmonthb(int y, int m, int jd_flag, struct monthlines 
>  	for (i = 0; i != 6; i++) {
>  		l = 0;
>  		for (j = firsts + 7 * i, k = 0; j < last && k != dw * 7;
> -		    j++, k += dw) { 
> +		    j++, k += dw) {
>  			if (j >= first) {
>  				if (jd_flag)
>  					dt.d = j - jan1 + 1;
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org