From d9975e05e840a450623ca41602c3636810d8b1ff Mon Sep 17 00:00:00 2001
From: okan
Date: Sat, 3 Sep 2011 09:17:16 +0000
Subject: "defaultfont" is unclear (and confusing while reading code) when it
 also applies to the user supplied font, so rename.

ok oga@
---
 parse.y | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 5421b12..acec2b2 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.30 2011/08/22 16:18:05 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.31 2011/09/03 09:17:16 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -105,8 +105,8 @@ yesno		: YES				{ $$ = 1; }
 		;
 
 main		: FONTNAME STRING		{
-			free(conf->DefaultFontName);
-			conf->DefaultFontName = $2;
+			free(conf->font);
+			conf->font = $2;
 		}
 		| STICKY yesno {
 			if ($2 == 0)
@@ -561,7 +561,7 @@ parse_config(const char *filename, struct conf *xconf)
 		for (i = 0; i < CWM_COLOR_MAX; i++)
 			xconf->color[i].name = conf->color[i].name;
 
-		xconf->DefaultFontName = conf->DefaultFontName;
+		xconf->font = conf->font;
 	}
 
 	free(conf);
-- 
cgit v1.2.3-2-gb3c3