merge

diff --combined st.c
index 98cd78a,abaa7bf..fca97ce
--- 1/st.c
--- 2/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;