diff options
| author | rsc <devnull@localhost> | 2004-03-26 03:45:55 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-03-26 03:45:55 +0000 |
| commit | 6b2d0fd94642d4e041bffac34cb79eaf9169760b (patch) | |
| tree | 9a22a2808815ebce90727bee52afc0ac477b11f9 | |
| parent | eeb7312231d91d32c561fd9dd07aeed554ba998d (diff) | |
| download | plan9port-6b2d0fd94642d4e041bffac34cb79eaf9169760b.tar.gz plan9port-6b2d0fd94642d4e041bffac34cb79eaf9169760b.tar.bz2 plan9port-6b2d0fd94642d4e041bffac34cb79eaf9169760b.zip | |
Bug fixes from Scott Schwartz.
Try to make 9term not crash when X errors happen.
| -rw-r--r-- | src/cmd/dict/world.c | 2 | ||||
| -rw-r--r-- | src/cmd/ed.c | 2 | ||||
| -rw-r--r-- | src/cmd/mc.c | 3 | ||||
| -rw-r--r-- | src/libdraw/x11-init.c | 3 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/cmd/dict/world.c b/src/cmd/dict/world.c index 19f3fb10..dba84e77 100644 --- a/src/cmd/dict/world.c +++ b/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 diff --git a/src/cmd/ed.c b/src/cmd/ed.c index 42fa3e07..1c1639b9 100644 --- a/src/cmd/ed.c +++ b/src/cmd/ed.c @@ -6,6 +6,8 @@ #include <bio.h> #include <regexp.h> +#undef EOF /* stdio? */ + enum { FNSIZE = 128, /* file name */ diff --git a/src/cmd/mc.c b/src/cmd/mc.c index ebe8b81c..45e7adf4 100644 --- a/src/cmd/mc.c +++ b/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 diff --git a/src/libdraw/x11-init.c b/src/libdraw/x11-init.c index c6fc8818..70bd6d45 100644 --- a/src/libdraw/x11-init.c +++ b/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); |