From: Christoph Lohmann <20h@r-36.net>
Date: Mon, 24 Sep 2012 08:24:36 +0000 (+0200)
Subject: Merging xft and current st heads.
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=21a0c4a2e08ede1d04c472497db7d9aef644d00c

Merging xft and current st heads.
---

21a0c4a2e08ede1d04c472497db7d9aef644d00c
diff --cc st.c
index f7fecf8,35f6f16..3c158c0
--- a/st.c
+++ b/st.c
@@@ -198,10 -195,8 +198,10 @@@ typedef struct 
  	Atom xembed;
  	XIM xim;
  	XIC xic;
 +	XftDraw *xft_draw;
 +	Visual *vis;
  	int scr;
- 	Bool isfixed; /* is fixed geometry? */
+ 	bool isfixed; /* is fixed geometry? */
  	int fx, fy, fw, fh; /* fixed geometry */
  	int tw, th; /* tty width and height */
  	int w;	/* window width */