commit 6b2d0fd94642d4e041bffac34cb79eaf9169760b
from: rsc <devnull@localhost>
date: Fri Mar 26 03:45:55 2004 UTC

Bug fixes from Scott Schwartz.

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

commit - eeb7312231d91d32c561fd9dd07aeed554ba998d
commit + 6b2d0fd94642d4e041bffac34cb79eaf9169760b
blob - 19f3fb10652bb09685036d9b659a862a1a017f90
blob + dba84e77f674f2965225d1b080f453e2fa8954cc
--- src/cmd/dict/world.c
+++ 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
blob - 42fa3e076aaa84fecd7be0eb5d85221bec3f51a0
blob + 1c1639b947df3201890cf1368457e4db00ca876b
--- src/cmd/ed.c
+++ src/cmd/ed.c
@@ -5,6 +5,8 @@
 #include <libc.h>
 #include <bio.h>
 #include <regexp.h>
+
+#undef EOF	/* stdio? */
 
 enum
 {
blob - ebe8b81c4ca1f6bfdf514583aeddfd0c4c3995ed
blob + 45e7adf4a21c83346dabdd4cabf96e1fe7483961
--- src/cmd/mc.c
+++ 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
blob - c6fc881878670dc3d11d96d49794b71019151cc5
blob + 70bd6d457f566c809ae939862f35f5af8a5abc4a
--- src/libdraw/x11-init.c
+++ 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);