Bug fixes from Scott Schwartz.

Try to make 9term not crash when X errors happen.

src/cmd/dict/world.c

@@ -11,6 +11,8 @@
 
 #define	GSHORT(p)	(((p)[0]<<8)|(p)[1])
 
+#define putchar dictputchar
+
 static void	putchar(int, int*);
 
 #define	NONE	0xffff

src/cmd/ed.c

@@ -6,6 +6,8 @@
 #include <bio.h>
 #include <regexp.h>
 
+#undef EOF	/* stdio? */
+
 enum
 {
 	FNSIZE	= 128,		/* file name */

src/cmd/mc.c

@@ -8,10 +8,11 @@
  *
  */
 #include	<u.h>
+#include	<sys/ioctl.h>
+#include	<sys/termios.h>
 #include	<libc.h>
 #include	<draw.h>
 #include	<bio.h>
-#include	<sys/ioctl.h>
 
 #define	WIDTH			80
 #define	TAB	4

src/libdraw/x11-init.c

@@ -127,6 +127,9 @@ xerror(XDisplay *d, XErrorEvent *e)
 
 	if(e->request_code == 42) /* XSetInputFocus */
 		return 0;
+	if(e->request_code == 18) /* XChangeProperty */
+		return 0;
+
 	print("X error: error_code=%d, request_code=%d, minor=%d disp=%p\n",
 		e->error_code, e->request_code, e->minor_code, d);
 	XGetErrorText(d, e->error_code, buf, sizeof buf);