From: Aurélien Aptel <aurelien.aptel@gmail.com>
Date: Mon, 13 Feb 2012 00:01:41 +0000 (+0100)
Subject: merge
X-Git-Url: https://git.xinqibao.xyz/st.git/commitdiff_plain/6de1ba6e7437919a137dfc5b925f5504085f4311?hp=-c

merge
---

6de1ba6e7437919a137dfc5b925f5504085f4311
diff --combined st.c
index 98cd78a,abaa7bf..fca97ce
--- a/st.c
+++ b/st.c
@@@ -34,7 -34,7 +34,7 @@@
  #endif
  
  #define USAGE \
- 	"st " VERSION " (c) 2010-2011 st engineers\n" \
+ 	"st " VERSION " (c) 2010-2012 st engineers\n" \
  	"usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
  
  /* XEMBED messages */
@@@ -86,10 -86,10 +86,10 @@@ typedef unsigned long ulong
  
  typedef struct {
  	char c[UTF_SIZ];     /* character code */
 -	char mode;  /* attribute flags */
 -	int fg;     /* foreground      */
 -	int bg;     /* background      */
 -	char state; /* state flags     */
 +	uchar mode;  /* attribute flags */
 +	uchar fg;     /* foreground      */
 +	uchar bg;     /* background      */
 +	uchar state; /* state flags     */
  } Glyph;
  
  typedef Glyph* Line;