summaryrefslogtreecommitdiff
path: root/x11/9term/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'x11/9term/patches/patch-ab')
-rw-r--r--x11/9term/patches/patch-ab36
1 files changed, 28 insertions, 8 deletions
diff --git a/x11/9term/patches/patch-ab b/x11/9term/patches/patch-ab
index 3ea38a85c22..fa1f2c5edf1 100644
--- a/x11/9term/patches/patch-ab
+++ b/x11/9term/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $
+$NetBSD: patch-ab,v 1.3 2012/05/04 16:38:44 joerg Exp $
---- 9term/9term.c.orig Fri Jun 3 09:35:39 1994
-+++ 9term/9term.c Fri Sep 26 16:45:48 1997
-@@ -10,7 +10,13 @@
+--- 9term/9term.c.orig 1994-06-03 08:35:39.000000000 +0000
++++ 9term/9term.c
+@@ -10,10 +10,22 @@
#include <frame.h>
#include <text.h>
@@ -16,7 +16,25 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $
#include <signal.h>
#include <sys/stat.h>
-@@ -153,9 +159,9 @@
++#define Cursor X11Cursor
++#define Font X11Font
++#include <X11/Intrinsic.h>
++#undef Cursor
++#undef Font
++
+ #include "9term.h"
+
+ int flushing;
+@@ -113,7 +125,7 @@ usage(char *s)
+ * Parse args, initialize display, spin off command interpreter
+ * and start handling keyboard, mouse, and command output events.
+ */
+-void
++int
+ main(int argc,char **argv)
+ {
+ int i, j;
+@@ -153,9 +165,9 @@ main(int argc,char **argv)
}
}
@@ -28,7 +46,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $
signal(SIGINT, SIG_IGN);
init_display(&argc, argv, cmd, resource);
-@@ -718,7 +724,7 @@
+@@ -718,7 +730,7 @@ interrupt(Text *t, Rune r)
texthighlight(t, t->length, t->length, F&~D);
#ifdef REMOTE
flushstream();
@@ -37,11 +55,13 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $
#else
sendrunes(&r, 1);
#endif
-@@ -804,7 +810,7 @@
+@@ -803,8 +815,8 @@ worderase(Text *t)
+ /*
* export a name-value pair to environment
*/
- int
+-int
-setenv(char *name, char *value, int overwrite)
++void
+O_setenv(char *name, char *value, int overwrite)
{
char *p;