summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-19 20:55:55 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-19 20:55:55 +0000
commit39a948f028c2e3cb3083d7d2f847acbd27facc23 (patch)
treea5688f12caadfa0177ab4c535e879f24c9df1215
parent54593d8ebb341f7c2a0321fbf4207d7848b44a7f (diff)
XFree86 4.3.99.902 (RC 2)xf86-4_3_99_902
-rw-r--r--ispell.c3
-rw-r--r--lisp/modules/xedit.lsp4
-rw-r--r--lisp/private.h9
3 files changed, 13 insertions, 3 deletions
diff --git a/ispell.c b/ispell.c
index 1066cb6..80efb3e 100644
--- a/ispell.c
+++ b/ispell.c
@@ -27,7 +27,7 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/ispell.c,v 1.19 2002/10/19 20:04:20 herrb Exp $ */
+/* $XFree86: xc/programs/xedit/ispell.c,v 1.20 2003/12/19 02:05:39 dawes Exp $ */
#include "xedit.h"
#include <stdlib.h>
@@ -42,6 +42,7 @@
#include <X11/Xaw/MenuButton.h>
#include <X11/Xaw/SmeBSB.h>
#include <X11/Xaw/SimpleMenu.h>
+#include <X11/Xos.h>
#define RECEIVE 1
#define SEND 2
diff --git a/lisp/modules/xedit.lsp b/lisp/modules/xedit.lsp
index 87a85c7..f59517e 100644
--- a/lisp/modules/xedit.lsp
+++ b/lisp/modules/xedit.lsp
@@ -27,7 +27,7 @@
;; Author: Paulo César Pereira de Andrade
;;
;;
-;; $XFree86: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.10 2003/01/16 06:25:50 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.11 2003/12/11 16:03:30 paulo Exp $
;;
(provide "xedit")
@@ -77,6 +77,8 @@
"RPM spec" "rpm" . *rpm-mode*)
("\\<XFree86\\.\\d+\\.log$"
"XFree86 log" "xlog" . *xlog-mode*)
+ ("\\.(diff|patch)"
+ "Patch file" "patch" . *patch-mode*)
))
diff --git a/lisp/private.h b/lisp/private.h
index 6b78d02..dd78caa 100644
--- a/lisp/private.h
+++ b/lisp/private.h
@@ -27,15 +27,22 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.41 2003/05/27 22:27:04 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */
#ifndef Lisp_private_h
#define Lisp_private_h
+#include <X11/Xos.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#if defined(X_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
#include <setjmp.h>
+#undef _POSIX_C_SOURCE
+#else
+#include <setjmp.h>
+#endif
#include <unistd.h>
#include <sys/time.h>
#include "lisp/internal.h"