X Strike Force XFree86 SVN commit: r1730 - in trunk/debian: . patches
Author: branden
Date: 2004-08-11 02:18:58 -0500 (Wed, 11 Aug 2004)
New Revision: 1730
Added:
trunk/debian/patches/000_stolen_from_HEAD_xedit.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab from XFree86 CVS (2003-10-02) several bugfixes to xedit, including a
fix for a SEGV in Lisp_New(). Move existing xedit patches from XFree86
CVS to their own patch file. (Closes: #257835)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-11 06:00:57 UTC (rev 1729)
+++ trunk/debian/CHANGESETS 2004-08-11 07:18:58 UTC (rev 1730)
@@ -305,4 +305,9 @@
protocols in xserver-xfree86's configuration script.
1727
+Grab from XFree86 CVS (2003-10-02) several bugfixes to xedit, including a
+fix for a SEGV in Lisp_New(). Move existing xedit patches from XFree86
+CVS to their own patch file. (Closes: #257835)
+ 1730
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-08-11 06:00:57 UTC (rev 1729)
+++ trunk/debian/TODO 2004-08-11 07:18:58 UTC (rev 1730)
@@ -60,8 +60,6 @@
+ #259080: xserver-xfree86: [debconf] specialized mouse defaults for Hurd [BR]
+ #261777: Problems handling multiple detected video cards; see what can be
done about this [BR]
-* #257835: fix SEGV in xedit on PowerPC [fix identified in pre-flag-day XFree86
- CVS]
* #258223: add et_EE.ISO-8859-15 to locale.alias [perhaps fix this and many
other bugs like it by writing a damn Python script to prep a diff against
locale.alias by scanning glibc's list of supported locales]
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-11 06:00:57 UTC (rev 1729)
+++ trunk/debian/changelog 2004-08-11 07:18:58 UTC (rev 1730)
@@ -222,6 +222,10 @@
and #097. Add "ValuMouseScroll" to the list of supported serial mouse
protocols in xserver-xfree86's configuration script.
+ * Grab from XFree86 CVS (2003-10-02) several bugfixes to xedit, including a
+ fix for a SEGV in Lisp_New(). Move existing xedit patches from XFree86
+ CVS to their own patch file. (Closes: #257835)
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -263,7 +267,7 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
- -- Branden Robinson <branden@debian.org> Wed, 11 Aug 2004 00:07:34 -0500
+ -- Branden Robinson <branden@debian.org> Wed, 11 Aug 2004 02:15:45 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-08-11 06:00:57 UTC (rev 1729)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-08-11 07:18:58 UTC (rev 1730)
@@ -260,7 +260,7 @@
xc/programs/lbxproxy/di/pm.c @ 1.10
xc/programs/makepsres/makepsres.c @ 1.8
-xc/programs/xedit/util.c @ 1.26
+[...]
*scanf(), snprintf() and strncpy() bounds fixes. (Anil Madhavapeddy,
using his gcc patch that checks for this kind of errors).
[Matthieu Herrb]
@@ -599,7 +599,6 @@
xc/programs/x11perf/x11perf.man @ 1.9
xc/programs/xauth/xauth.man @ 1.8
xc/programs/xditview/xditview.man @ 1.5
-xc/programs/xedit/xedit.man @ 1.19
xc/programs/xeyes/xeyes.man @ 1.4
xc/programs/xkbevd/xkbevd.man @ 1.8
xc/programs/xkbprint/xkbprint.man @ 1.8
@@ -6587,32 +6586,6 @@
directoryCount++;
directories = (char **) ckrealloc((char *) directories,
directoryCount * sizeof(char *),
-Index: xc/programs/xedit/util.c
-===================================================================
-RCS file: /cvs/xc/programs/xedit/util.c,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -r1.25 -r1.26
---- xc/programs/xedit/util.c 4 Dec 2002 05:27:56 -0000 1.25
-+++ xc/programs/xedit/util.c 7 May 2003 20:54:43 -0000 1.26
-@@ -24,7 +24,7 @@
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.
- */
--/* $XFree86: xc/programs/xedit/util.c,v 1.25 2002/12/04 05:27:56 paulo Exp $ */
-+/* $XFree86: xc/programs/xedit/util.c,v 1.26 2003/05/07 20:54:43 herrb Exp $ */
-
- #include <stdio.h>
- #include <stdlib.h> /* for realpath() */
-@@ -858,7 +858,7 @@
- return;
-
- if (*num_params == 1) {
-- strncpy(path, params[0], sizeof(path - 2));
-+ strncpy(path, params[0], sizeof(path) - 2);
- path[sizeof(path) - 2] = '\0';
- }
- else {
Index: xc/programs/Xserver/Xserver.man
===================================================================
RCS file: /cvs/xc/programs/Xserver/Xserver.man,v
@@ -23366,68 +23339,6 @@
.I xditview.
.TP 8
.B \-backingStore \fIbacking-store-type\fP
-Index: xc/programs/xedit/xedit.man
-===================================================================
-RCS file: /cvs/xc/programs/xedit/xedit.man,v
-retrieving revision 1.18
-retrieving revision 1.19
-diff -u -r1.18 -r1.19
---- xc/programs/xedit/xedit.man 12 Oct 2002 16:06:48 -0000 1.18
-+++ xc/programs/xedit/xedit.man 29 May 2003 21:48:11 -0000 1.19
-@@ -25,7 +25,7 @@
- .\" other dealings in this Software without prior written authorization
- .\" from the X Consortium.
- .\"
--.\" $XFree86: xc/programs/xedit/xedit.man,v 1.18 2002/10/12 16:06:48 herrb Exp $
-+.\" $XFree86: xc/programs/xedit/xedit.man,v 1.19 2003/05/29 21:48:11 herrb Exp $
- .\"
- .TH XEDIT 1 __vendorversion__
- .SH NAME
-@@ -270,7 +270,7 @@
- .B %p
- prints the insert position offset, and
- .B %s
--prints the current file size. It is also allowed to specifie field sizes,
-+prints the current file size. It is also allowed to specify field sizes,
- with the notation
- .B %\-?[0\-9]+
- \&. The default format string is ``L%l'', which shows the character ``L''
-@@ -289,7 +289,7 @@
- the file being edited is changed.
- .TP 8
- .B autoReplace (\fPClass \fBReplace)
--This resource is useful to automatically correct common mispelling errors, but
-+This resource is useful to automatically correct common misspelling errors, but
- can also be used to create simple macros. The format is
- \fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
- Example of use:
-@@ -338,7 +338,7 @@
- words generated through affix removal. The default value is False.
- .TP 8
- .B ispell.lookCommand (\fPClass \fBispell.CommandLine)
--The path to the program to search for alternate words, and possibily,
-+The path to the program to search for alternate words, and possibly,
- additional arguments. The default program used is \fI/usr/bin/egrep\fP.
- .TP 8
- .B ispell.wordsFile (\fPClass \fBispell.Words)
-@@ -351,7 +351,7 @@
- .TP 8
- .B ispell.missLabel (\fPClass \fBispell.Status)
- String displayed in the ispell status bar when ispell returns a list of one
--or more words to match a mispelled one. The default value is \fIMiss\fP.
-+or more words to match a misspelled one. The default value is \fIMiss\fP.
- .TP 8
- .B ispell.rootLabel (\fPClass \fBispell.Status)
- String displayed in the ispell status bar when the word is not in the dictionary,
-@@ -376,7 +376,7 @@
- The default value is \fIEnd Of File\fP.
- .TP 8
- .B ispell.repeatLabel (\fPClass \fBispell.Status)
--The string displayed in the ispell status bar when two indentical words are found
-+The string displayed in the ispell status bar when two identical words are found
- together in the file. The default value is \fIRepeat\fP.
- .TP 8
- .B ispell.lookLabel (\fPClass \fBispell.Status)
Index: xc/programs/xeyes/xeyes.man
===================================================================
RCS file: /cvs/xc/programs/xeyes/xeyes.man,v
Added: trunk/debian/patches/000_stolen_from_HEAD_xedit.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xedit.diff 2004-08-11 06:00:57 UTC (rev 1729)
+++ trunk/debian/patches/000_stolen_from_HEAD_xedit.diff 2004-08-11 07:18:58 UTC (rev 1730)
@@ -0,0 +1,2491 @@
+$Id$
+
+[Do not recode this file!]
+
+xc/programs/xedit/Imakefile @ 1.25
+xc/programs/xedit/lisp/core.c @ 1.70
+xc/programs/xedit/lisp/helper.c @ 1.48
+xc/programs/xedit/lisp/math.c @ 1.23
+xc/programs/xedit/lisp/read.c @ 1.35
+xc/programs/xedit/lisp/time.c @ 1.8
+xc/programs/xedit/lisp/mp/mpi.c @ 1.13
+[...]
+ 26. Updates for building on OS/2 (#5650, Frank Giessler).
+[David Dawes]
+
+xc/programs/xedit/lisp/require.c @ 1.17
+xc/programs/xedit/lisp/string.c @ 1.23
+xc/programs/xedit/lisp/time.c @ 1.9
+xc/programs/xedit/lisp/modules/Imakefile @ 1.14
+xc/programs/xedit/lisp/modules/x11.c @ 1.11
+xc/programs/xedit/lisp/modules/xaw.c @ 1.15
+xc/programs/xedit/lisp/modules/xt.c @ 1.20
+ o Minor fixes to allow compiling the modules, and fixed compiler warnings.
+ o Changed time.c to return NIL instead of NULL for OS/2.
+ o Fix bug in the parse-integer function.
+[Paulo Cesar Pereira de Andrade]
+
+xc/programs/xedit/lisp/Imakefile @ 1.23
+[...]
+ 144. Portability changes for older Sun compilers (Alan Coopersmith).
+[Marc Aurele La France]
+
+xc/programs/xedit/lisp/Imakefile @ 1.24
+ back out previous change. It breaks compilation with gcc.
+ XXX a better fix is needed. I'd suggest renaming the 4 headers
+ XXX that have same names as files in /usr/include.
+[Marc Aurele La France]
+
+xc/programs/xedit/lisp/Imakefile @ 1.25
+xc/programs/xedit/lisp/bytecode.c @ 1.16
+xc/programs/xedit/lisp/bytecode.h @ 1.6
+xc/programs/xedit/lisp/core.c @ 1.71
+xc/programs/xedit/lisp/core.h @ 1.36
+xc/programs/xedit/lisp/debugger.c @ 1.25
+xc/programs/xedit/lisp/debugger.h @ 1.8
+xc/programs/xedit/lisp/format.c @ 1.29
+xc/programs/xedit/lisp/format.h @ 1.4
+xc/programs/xedit/lisp/hash.c @ 1.5
+xc/programs/xedit/lisp/hash.h @ 1.3
+xc/programs/xedit/lisp/helper.c @ 1.49
+xc/programs/xedit/lisp/helper.h @ 1.16
+xc/programs/xedit/lisp/internal.h @ 1.50
+xc/programs/xedit/lisp/io.c @ 1.17
+xc/programs/xedit/lisp/io.h @ 1.9
+xc/programs/xedit/lisp/lisp.c @ 1.86
+xc/programs/xedit/lisp/lsp.c @ 1.8
+xc/programs/xedit/lisp/math.c @ 1.24
+xc/programs/xedit/lisp/math.h @ 1.7
+xc/programs/xedit/lisp/package.c @ 1.21
+xc/programs/xedit/lisp/package.h @ 1.8
+xc/programs/xedit/lisp/pathname.c @ 1.18
+xc/programs/xedit/lisp/pathname.h @ 1.5
+xc/programs/xedit/lisp/private.h @ 1.40
+xc/programs/xedit/lisp/read.c @ 1.36
+xc/programs/xedit/lisp/read.h @ 1.4
+xc/programs/xedit/lisp/regex.c @ 1.11
+xc/programs/xedit/lisp/regex.h @ 1.4
+xc/programs/xedit/lisp/require.c @ 1.18
+xc/programs/xedit/lisp/require.h @ 1.5
+xc/programs/xedit/lisp/stream.c @ 1.22
+xc/programs/xedit/lisp/stream.h @ 1.9
+xc/programs/xedit/lisp/string.c @ 1.24
+xc/programs/xedit/lisp/string.h @ 1.12
+xc/programs/xedit/lisp/struct.c @ 1.23
+xc/programs/xedit/lisp/struct.h @ 1.7
+xc/programs/xedit/lisp/time.c @ 1.10
+xc/programs/xedit/lisp/time.h @ 1.4
+xc/programs/xedit/lisp/write.c @ 1.31
+xc/programs/xedit/lisp/write.h @ 1.10
+xc/programs/xedit/lisp/xedit.c @ 1.25
+xc/programs/xedit/lisp/xedit.h @ 1.6
+xc/programs/xedit/lisp/modules/Imakefile @ 1.15
+xc/programs/xedit/lisp/modules/psql.c @ 1.13
+xc/programs/xedit/lisp/modules/x11.c @ 1.12
+xc/programs/xedit/lisp/modules/xaw.c @ 1.16
+xc/programs/xedit/lisp/modules/xt.c @ 1.21
+ Fix xedit build problems (without renaming its offending headers).
+[Marc Aurele La France]
+
+xc/programs/xedit/util.c @ 1.26
+[...]
+ *scanf(), snprintf() and strncpy() bounds fixes. (Anil Madhavapeddy,
+ using his gcc patch that checks for this kind of errors).
+[Matthieu Herrb]
+
+xc/programs/xedit/Imakefile @ 1.26
+xc/programs/xedit/lisp/Imakefile @ 1.26
+xc/programs/xedit/lisp/xedit.c @ 1.26
+ 177. Fix another xedit compile problem (Marc La France).
+
+xc/programs/xedit/lisp.c @ 1.21
+ Typos
+[Marc Aurele La France]
+
+xc/programs/xedit/util.c @ 1.27
+ Signedness glitch
+[Marc Aurele La France]
+
+xc/programs/xedit/lisp/lisp.c @ 1.87
+ Signedness buglet
+[Marc Aurele La France]
+
+xc/programs/xedit/commands.c @ 1.30
+xc/programs/xedit/lisp/bytecode.c @ 1.17
+xc/programs/xedit/lisp/compile.c @ 1.15
+xc/programs/xedit/lisp/core.c @ 1.72
+xc/programs/xedit/lisp/format.c @ 1.30
+xc/programs/xedit/lisp/helper.c @ 1.50
+xc/programs/xedit/lisp/internal.h @ 1.51
+xc/programs/xedit/lisp/io.h @ 1.10
+xc/programs/xedit/lisp/lisp.c @ 1.88
+xc/programs/xedit/lisp/private.h @ 1.41
+xc/programs/xedit/lisp/read.c @ 1.37
+xc/programs/xedit/lisp/string.c @ 1.25
+xc/programs/xedit/lisp/write.c @ 1.32
+xc/programs/xedit/lisp/modules/Imakefile @ 1.16
+ 194. IRIX 6.5 build fixes and noise reductions (Marc La France).
+
+xc/programs/xedit/lisp/bytecode.c @ 1.18
+ Warning fix
+[Marc Aurele La France]
+
+xc/programs/xedit/xedit.man @ 1.19
+[...]
+ Fix manual pages typos (Bugzilla #316, Jens Schweikhardt).
+[Matthieu Herrb]
+
+xc/programs/xedit/lisp/hash.c @ 1.6
+xc/programs/xedit/lisp/helper.c @ 1.51
+ Minor xedit lisp patches:
+ o hash.c: Fix incorrect memory reallocation when rehashing hash tables.
+ o helper.c: Fix inverted logic when checking an object type.
+[Paulo Cesar Pereira de Andrade]
+
+xc/programs/xedit/lisp/lisp.c @ 1.89
+ 468. Fixed xedit coredumps: update counter of free objects when getting an
+ object from the list (BugzillaR #722, Egbert Eich).
+[Egbert Eich]
+
+Index: xc/programs/xedit/Imakefile
+===================================================================
+RCS file: /cvs/xc/programs/xedit/Imakefile,v
+retrieving revision 1.24
+retrieving revision 1.26
+diff -u -r1.24 -r1.26
+--- xc/programs/xedit/Imakefile 1 Oct 2002 14:31:46 -0000 1.24
++++ xc/programs/xedit/Imakefile 20 May 2003 21:44:48 -0000 1.26
+@@ -1,7 +1,6 @@
+ XCOMM $XConsortium: Imakefile,v 1.17 93/08/17 20:49:32 rws Exp $
+-XCOMM $XFree86: xc/programs/xedit/Imakefile,v 1.24 2002/10/01 14:31:46 alanh Exp $
++XCOMM $XFree86: xc/programs/xedit/Imakefile,v 1.26 2003/05/20 21:44:48 tsi Exp $
+
+-#ifndef OS2Architecture
+ #include "lisp/lisp.cf"
+
+ #if BuildSharedLispModules
+@@ -17,7 +16,6 @@
+ LISPLIBS = -Llisp -llisp -Llisp/mp -lmp -Llisp/re -lre
+ LISP_SRC = lisp.c
+ LISP_OBJ = lisp.o
+-#endif
+
+ DEPLIBS = XawClientDepLibs $(SUBDIRS)
+ LOCAL_LIBRARIES = $(LISPLIBS) XawClientLibs $(DLLIB)
+@@ -36,7 +34,7 @@
+ SYS_OBJS = $(RP_OBJS) $(STRCCMP_OBJS)
+ SYS_DEFINES = $(RP_DEFINES) $(STRCCMP_DEFINES)
+ DEFINES = $(SIGNAL_DEFINES) $(SYS_DEFINES)
+- INCLUDES = -I. -Ilisp/re -I- $(MISC_INCLUDES)
++ INCLUDES = -I. -Ilisp/re $(MISC_INCLUDES)
+
+ SRCS = xedit.c commands.c util.c $(SYS_SRCS) ispell.c options.c \
+ hook.c $(LISP_SRC)
+Index: xc/programs/xedit/commands.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/commands.c,v
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -r1.29 -r1.30
+--- xc/programs/xedit/commands.c 5 Nov 2002 06:57:05 -0000 1.29
++++ xc/programs/xedit/commands.c 27 May 2003 22:27:01 -0000 1.30
+@@ -24,7 +24,7 @@
+ * used in advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.
+ */
+-/* $XFree86: xc/programs/xedit/commands.c,v 1.29 2002/11/05 06:57:05 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/commands.c,v 1.30 2003/05/27 22:27:01 tsi Exp $ */
+
+ #include <X11/Xfuncs.h>
+ #include <X11/Xos.h>
+@@ -676,7 +676,7 @@
+ char **matches, *save, *dir_name, *file_name, match[257];
+ unsigned n_matches, len, mlen, buflen;
+ DIR *dir;
+- Bool changed, slash = False, dot = False, has_dot = False;
++ Bool changed, slash = False, has_dot = False;
+ #define SM_NEVER 0
+ #define SM_HINT 1
+ #define SM_ALWAYS 2
+@@ -744,7 +744,6 @@
+
+ if (save[0] == '~' && save[1]) {
+ char *slash2 = strchr(save, '/');
+- int nlen;
+
+ if (slash2) {
+ struct passwd *pw;
+@@ -754,7 +753,7 @@
+
+ *slash2 = '\0';
+ name = save + 1;
+- if ((nlen = strlen(name)) != 0)
++ if (strlen(name) != 0)
+ pw = getpwnam(name);
+ else
+ pw = getpwuid(getuid());
+@@ -798,7 +797,6 @@
+ }
+ else {
+ dir_name = ".";
+- dot = True;
+ file_name = save;
+ }
+ len = strlen(file_name);
+Index: xc/programs/xedit/lisp.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- xc/programs/xedit/lisp.c 4 Dec 2002 05:27:56 -0000 1.20
++++ xc/programs/xedit/lisp.c 23 May 2003 14:56:51 -0000 1.21
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp.c,v 1.20 2002/12/04 05:27:56 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp.c,v 1.21 2003/05/23 14:56:51 tsi Exp $ */
+
+ #include "xedit.h"
+ #include "lisp/lisp.h"
+@@ -261,10 +261,10 @@
+ return;
+
+ XawTextSourceClearEntities(source,
+- XawTextSourceScan(source, 0, XawsdLeft,
+- XawstAll, 1, True),
+- XawTextSourceScan(source, 0, XawsdRight,
+- XawstAll, 1, True));
++ XawTextSourceScan(source, 0, XawstAll,
++ XawsdLeft, 1, True),
++ XawTextSourceScan(source, 0, XawstAll,
++ XawsdRight, 1, True));
+ XeditLispUnsetEditMode(item);
+ if (info)
+ XeditLispSetEditMode(item, info->symbol);
+Index: xc/programs/xedit/util.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/util.c,v
+retrieving revision 1.25
+retrieving revision 1.27
+diff -u -r1.25 -r1.27
+--- xc/programs/xedit/util.c 4 Dec 2002 05:27:56 -0000 1.25
++++ xc/programs/xedit/util.c 23 May 2003 14:58:02 -0000 1.27
+@@ -24,7 +24,7 @@
+ * used in advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.
+ */
+-/* $XFree86: xc/programs/xedit/util.c,v 1.25 2002/12/04 05:27:56 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/util.c,v 1.27 2003/05/23 14:58:02 tsi Exp $ */
+
+ #include <stdio.h>
+ #include <stdlib.h> /* for realpath() */
+@@ -234,7 +234,7 @@
+ if (flist.itens[idx] == item) {
+ if (idx + 1 < flist.num_itens)
+ nitem = flist.itens[idx + 1];
+- else if (idx - 1 >= 0)
++ else if (idx >= 1)
+ nitem = flist.itens[idx - 1];
+ break;
+ }
+@@ -858,7 +858,7 @@
+ return;
+
+ if (*num_params == 1) {
+- strncpy(path, params[0], sizeof(path - 2));
++ strncpy(path, params[0], sizeof(path) - 2);
+ path[sizeof(path) - 2] = '\0';
+ }
+ else {
+Index: xc/programs/xedit/xedit.man
+===================================================================
+RCS file: /cvs/xc/programs/xedit/xedit.man,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- xc/programs/xedit/xedit.man 12 Oct 2002 16:06:48 -0000 1.18
++++ xc/programs/xedit/xedit.man 29 May 2003 21:48:11 -0000 1.19
+@@ -25,7 +25,7 @@
+ .\" other dealings in this Software without prior written authorization
+ .\" from the X Consortium.
+ .\"
+-.\" $XFree86: xc/programs/xedit/xedit.man,v 1.18 2002/10/12 16:06:48 herrb Exp $
++.\" $XFree86: xc/programs/xedit/xedit.man,v 1.19 2003/05/29 21:48:11 herrb Exp $
+ .\"
+ .TH XEDIT 1 __vendorversion__
+ .SH NAME
+@@ -270,7 +270,7 @@
+ .B %p
+ prints the insert position offset, and
+ .B %s
+-prints the current file size. It is also allowed to specifie field sizes,
++prints the current file size. It is also allowed to specify field sizes,
+ with the notation
+ .B %\-?[0\-9]+
+ \&. The default format string is ``L%l'', which shows the character ``L''
+@@ -289,7 +289,7 @@
+ the file being edited is changed.
+ .TP 8
+ .B autoReplace (\fPClass \fBReplace)
+-This resource is useful to automatically correct common mispelling errors, but
++This resource is useful to automatically correct common misspelling errors, but
+ can also be used to create simple macros. The format is
+ \fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
+ Example of use:
+@@ -338,7 +338,7 @@
+ words generated through affix removal. The default value is False.
+ .TP 8
+ .B ispell.lookCommand (\fPClass \fBispell.CommandLine)
+-The path to the program to search for alternate words, and possibily,
++The path to the program to search for alternate words, and possibly,
+ additional arguments. The default program used is \fI/usr/bin/egrep\fP.
+ .TP 8
+ .B ispell.wordsFile (\fPClass \fBispell.Words)
+@@ -351,7 +351,7 @@
+ .TP 8
+ .B ispell.missLabel (\fPClass \fBispell.Status)
+ String displayed in the ispell status bar when ispell returns a list of one
+-or more words to match a mispelled one. The default value is \fIMiss\fP.
++or more words to match a misspelled one. The default value is \fIMiss\fP.
+ .TP 8
+ .B ispell.rootLabel (\fPClass \fBispell.Status)
+ String displayed in the ispell status bar when the word is not in the dictionary,
+@@ -376,7 +376,7 @@
+ The default value is \fIEnd Of File\fP.
+ .TP 8
+ .B ispell.repeatLabel (\fPClass \fBispell.Status)
+-The string displayed in the ispell status bar when two indentical words are found
++The string displayed in the ispell status bar when two identical words are found
+ together in the file. The default value is \fIRepeat\fP.
+ .TP 8
+ .B ispell.lookLabel (\fPClass \fBispell.Status)
+Index: xc/programs/xedit/lisp/Imakefile
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/Imakefile,v
+retrieving revision 1.22
+retrieving revision 1.26
+diff -u -r1.22 -r1.26
+--- xc/programs/xedit/lisp/Imakefile 14 Dec 2002 04:41:13 -0000 1.22
++++ xc/programs/xedit/lisp/Imakefile 20 May 2003 21:44:48 -0000 1.26
+@@ -1,4 +1,4 @@
+-XCOMM $XFree86: xc/programs/xedit/lisp/Imakefile,v 1.22 2002/12/14 04:41:13 dawes Exp $
++XCOMM $XFree86: xc/programs/xedit/lisp/Imakefile,v 1.26 2003/05/20 21:44:48 tsi Exp $
+
+ #include "lisp.cf"
+ #include "lisp.rules"
+@@ -112,7 +112,7 @@
+ DEFINES = -DLISP $(SHARED_DEFINES) -DLISPDIR='"$(LISPDIR)"' \
+ $(SNPRINTF_DEFS) $(SYS_DEFINES) $(SIGNAL_DEFINES)
+ DEPLIBS = mp re
+- INCLUDES = -I. -Imp -Ire -I- $(MISC_INCLUDES)
++ INCLUDES = -I.. -Imp -Ire -I../.. $(MISC_INCLUDES)
+ LOCAL_LIBRARIES = -L. -llisp -Lmp -lmp -Lre -lre -lm $(DLLIB)
+
+ #ifdef IHaveSubdirs
+Index: xc/programs/xedit/lisp/bytecode.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/bytecode.c,v
+retrieving revision 1.15
+retrieving revision 1.18
+diff -u -r1.15 -r1.18
+--- xc/programs/xedit/lisp/bytecode.c 29 Jan 2003 03:05:53 -0000 1.15
++++ xc/programs/xedit/lisp/bytecode.c 28 May 2003 14:13:11 -0000 1.18
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/bytecode.c,v 1.15 2003/01/29 03:05:53 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/bytecode.c,v 1.18 2003/05/28 14:13:11 tsi Exp $ */
+
+
+ /*
+@@ -93,8 +93,8 @@
+ */
+
+
+-#include "bytecode.h"
+-#include "write.h"
++#include "lisp/bytecode.h"
++#include "lisp/write.h"
+
+ #define SYMBOL_KEYWORD -1 /* A keyword, load as constant */
+ #define SYMBOL_CONSTANT -2 /* Defined as constant at compile time */
+@@ -337,7 +337,7 @@
+ /*
+ * Implementation
+ */
+-#include "compile.c"
++#include "lisp/compile.c"
+
+ void
+ LispBytecodeInit(void)
+@@ -395,11 +395,10 @@
+ goto finished_compilation;
+ else if (atom->a_function) {
+ LispCom com;
+- int failed, *pfailed;
+- int lex, base, *plex, *pbase;
++ int failed;
++ int lex = 0, base;
+ LispArgList *alist;
+- LispObj *lambda, *form, *arguments, **parguments;
+- LispObj **presult, **pwarnings_p, **pfailure_p, **pform;
++ LispObj *lambda, *form, *arguments;
+
+ lambda = atom->property->fun.function;
+ if (definition != UNSPEC || lambda->funtype != LispFunction)
+@@ -485,14 +484,6 @@
+ com.plist = CONS(NIL, NIL);
+ GC_PROTECT(com.plist);
+
+- pfailed = &failed;
+- plex = &lex;
+- pbase = &base;
+- pform = &form;
+- presult = &result;
+- pwarnings_p = &warnings_p;
+- pfailure_p = &failure_p;
+- parguments = &arguments;
+ failed = 1;
+ if (setjmp(com.jmp) == 0) {
+ /* Save interpreter state */
+@@ -681,7 +672,6 @@
+ LispObj **constants;
+ LispAtom **symbols;
+ LispBuiltin **builtins;
+- unsigned char **codes;
+ LispObj **names;
+ short stack, num_constants, num_symbols, num_builtins, num_bytecodes;
+ unsigned char *base, *stream = bytecode->data.bytecode.bytecode->code;
+@@ -720,7 +710,6 @@
+ stream += num_symbols * sizeof(LispAtom*);
+ builtins = (LispBuiltin**)stream;
+ stream += num_builtins * sizeof(LispBuiltin*);
+- codes = (unsigned char**)stream;
+ stream += num_bytecodes * sizeof(unsigned char*);
+ names = (LispObj**)stream;
+ stream += num_bytecodes * sizeof(LispObj*);
+@@ -1200,9 +1189,8 @@
+ LispCompileForm(LispObj *form)
+ {
+ GC_ENTER();
+- int failed, *pfailed;
++ int failed;
+ LispCom com;
+- LispObj *code, **pform;
+
+ if (!CONSP(form))
+ /* Incorrect call or NIL */
+@@ -1217,11 +1205,9 @@
+ com.plist = CONS(NIL, NIL);
+ GC_PROTECT(com.plist);
+
+- pfailed = &failed;
+- pform = &form;
+ failed = 1;
+ if (setjmp(com.jmp) == 0) {
+- for (code = form; CONSP(form); form = CDR(form)) {
++ for (; CONSP(form); form = CDR(form)) {
+ com.form = form;
+ ComEval(&com, CAR(form));
+ }
+Index: xc/programs/xedit/lisp/bytecode.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/bytecode.h,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- xc/programs/xedit/lisp/bytecode.h 23 Nov 2002 08:26:48 -0000 1.5
++++ xc/programs/xedit/lisp/bytecode.h 27 Apr 2003 18:17:31 -0000 1.6
+@@ -27,9 +27,9 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/bytecode.h,v 1.5 2002/11/23 08:26:48 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/bytecode.h,v 1.6 2003/04/27 18:17:31 tsi Exp $ */
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ #ifndef Lisp_Bytecode_h
+ #define Lisp_Bytecode_h
+Index: xc/programs/xedit/lisp/compile.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/compile.c,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
+--- xc/programs/xedit/lisp/compile.c 30 Jan 2003 02:46:25 -0000 1.14
++++ xc/programs/xedit/lisp/compile.c 27 May 2003 22:27:01 -0000 1.15
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/compile.c,v 1.14 2003/01/30 02:46:25 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/compile.c,v 1.15 2003/05/27 22:27:01 tsi Exp $ */
+
+ #define VARIABLE_USED 0x0001
+ #define VARIABLE_ARGUMENT 0x0002
+@@ -2142,7 +2142,7 @@
+ static LispObj *
+ ComMacroExpand(LispCom *com, LispObj *lambda)
+ {
+- LispObj *result, **presult = &result, **plambda;
++ LispObj *result, **presult = &result;
+ int jumped, *pjumped = &jumped, backquote, *pbackquote = &backquote;
+ LispBlock *block;
+
+@@ -2154,7 +2154,6 @@
+ interpreter_lex = lisp__data.env.lex;
+
+ /* Use the variables */
+- plambda = λ
+ *presult = NIL;
+ *pjumped = 1;
+ *pbackquote = !CONSP(lambda);
+Index: xc/programs/xedit/lisp/core.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/core.c,v
+retrieving revision 1.69
+retrieving revision 1.72
+diff -u -r1.69 -r1.72
+--- xc/programs/xedit/lisp/core.c 20 Dec 2002 04:32:45 -0000 1.69
++++ xc/programs/xedit/lisp/core.c 27 May 2003 22:27:01 -0000 1.72
+@@ -27,15 +27,15 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/core.c,v 1.69 2002/12/20 04:32:45 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/core.c,v 1.72 2003/05/27 22:27:01 tsi Exp $ */
+
+-#include "io.h"
+-#include "core.h"
+-#include "format.h"
+-#include "helper.h"
+-#include "package.h"
+-#include "private.h"
+-#include "write.h"
++#include "lisp/io.h"
++#include "lisp/core.h"
++#include "lisp/format.h"
++#include "lisp/helper.h"
++#include "lisp/package.h"
++#include "lisp/private.h"
++#include "lisp/write.h"
+
+ /*
+ * Types
+@@ -62,6 +62,10 @@
+ break; \
+ }
+
++#ifdef __UNIXOS2__
++# define finite(x) isfinite(x)
++#endif
++
+ #ifdef NEED_SETENV
+ extern int setenv(const char *name, const char *value, int overwrite);
+ extern void unsetenv(const char *name);
+@@ -580,7 +584,7 @@
+ */
+ {
+ int did_jump, *pdid_jump = &did_jump;
+- LispObj *res, **pres = &res, **pbody;
++ LispObj *res, **pres = &res;
+ LispBlock *block;
+
+ LispObj *name, *body;
+@@ -592,7 +596,6 @@
+ LispDestroy("%s: %s cannot name a block",
+ STRFUN(builtin), STROBJ(name));
+
+- pbody = &body;
+ *pres = NIL;
+ *pdid_jump = 1;
+ block = LispBeginBlock(name, LispBlockTag);
+@@ -779,12 +782,11 @@
+ LispObj *res, **pres = &res;
+ LispBlock *block;
+
+- LispObj *tag, *body, **pbody;
++ LispObj *tag, *body;
+
+ body = ARGUMENT(1);
+ tag = ARGUMENT(0);
+
+- pbody = &body;
+ *pres = NIL;
+ *pdid_jump = 1;
+ block = LispBeginBlock(tag, LispBlockCatch);
+@@ -1013,9 +1015,8 @@
+ constantp form &optional environment
+ */
+ {
+- LispObj *form, *environment;
++ LispObj *form;
+
+- environment = ARGUMENT(1);
+ form = ARGUMENT(0);
+
+ /* not all self-evaluating objects are considered constants */
+@@ -1936,8 +1937,8 @@
+ ignore-erros &rest body
+ */
+ {
+- LispObj *result, **presult, **pbody;
+- int i, jumped, *pjumped;
++ LispObj *result;
++ int i, jumped;
+ LispBlock *block;
+
+ /* interpreter state */
+@@ -1963,9 +1964,6 @@
+ memcpy(mem, lisp__data.mem.mem, mem_level * sizeof(void*));
+
+ ++lisp__data.ignore_errors;
+- presult = &result;
+- pjumped = &jumped;
+- pbody = &body;
+ result = NIL;
+ jumped = 1;
+ block = LispBeginBlock(NIL, LispBlockProtect);
+@@ -2618,16 +2616,13 @@
+ LispType type;
+
+ LispObj *dimensions, *element_type, *initial_element, *initial_contents,
+- *adjustable, *fill_pointer, *displaced_to,
+- *displaced_index_offset;
++ *displaced_to, *displaced_index_offset;
+
+ dim = array = NIL;
+ type = LispNil_t;
+
+ displaced_index_offset = ARGUMENT(7);
+ displaced_to = ARGUMENT(6);
+- fill_pointer = ARGUMENT(5);
+- adjustable = ARGUMENT(4);
+ initial_contents = ARGUMENT(3);
+ initial_element = ARGUMENT(2);
+ element_type = ARGUMENT(1);
+@@ -4050,9 +4045,9 @@
+ {
+ GC_ENTER();
+ int head = lisp__data.env.length, i, count, ostk[32], *offsets;
+- LispObj *result, *list, *symbol, *value, **presult, **psymbols, **pbody;
+- int jumped, *pjumped, *pcount, **poffsets;
+- char fstk[32], *flags, **pflags;
++ LispObj *result, *list, *symbol, *value;
++ int jumped;
++ char fstk[32], *flags;
+ LispBlock *block;
+ LispAtom *atom;
+
+@@ -4075,15 +4070,6 @@
+ values = EVAL(values);
+ GC_PROTECT(values);
+
+- /* use variables */
+- pbody = &body;
+- psymbols = &symbols;
+- presult = &result;
+- pjumped = &jumped;
+- poffsets = &offsets;
+- pcount = &count;
+- pflags = &flags;
+-
+ /* count/check symbols and allocate space to remember symbol state */
+ for (count = 0, list = symbols; CONSP(list); count++, list = CDR(list)) {
+ symbol = CAR(list);
+@@ -6302,8 +6288,7 @@
+ {
+ GC_ENTER();
+ int stack, lex, length;
+- LispObj *list, *body, *ptr, *tag, *labels, *map,
+- **p_list, **p_body, **p_labels;
++ LispObj *list, *body, *ptr, *tag, *labels, *map, **p_body;
+ LispBlock *block;
+
+ body = ARGUMENT(0);
+@@ -6361,9 +6346,7 @@
+
+ /* Initialize */
+ list = body;
+- p_list = &list;
+ p_body = &body;
+- p_labels = &labels;
+ block = LispBeginBlock(NIL, LispBlockBody);
+
+ /* Loop */
+@@ -6810,12 +6793,11 @@
+ while test &rest body
+ */
+ {
+- LispObj *result, *test, *body, *prog;
++ LispObj *test, *body, *prog;
+
+ body = ARGUMENT(1);
+ test = ARGUMENT(0);
+
+- result = NIL;
+ for (;;) {
+ if (EVAL(test) != NIL) {
+ for (prog = body; CONSP(prog); prog = CDR(prog))
+Index: xc/programs/xedit/lisp/core.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/core.h,v
+retrieving revision 1.35
+retrieving revision 1.36
+diff -u -r1.35 -r1.36
+--- xc/programs/xedit/lisp/core.h 20 Dec 2002 04:32:46 -0000 1.35
++++ xc/programs/xedit/lisp/core.h 27 Apr 2003 18:17:32 -0000 1.36
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/core.h,v 1.35 2002/12/20 04:32:46 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/core.h,v 1.36 2003/04/27 18:17:32 tsi Exp $ */
+
+ #ifndef Lisp_core_h
+ #define Lisp_core_h
+
+-#include "internal.h"
++#include "lisp/internal.h"
+
+ void LispCoreInit(void);
+
+Index: xc/programs/xedit/lisp/debugger.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/debugger.c,v
+retrieving revision 1.24
+retrieving revision 1.25
+diff -u -r1.24 -r1.25
+--- xc/programs/xedit/lisp/debugger.c 12 Nov 2002 06:05:07 -0000 1.24
++++ xc/programs/xedit/lisp/debugger.c 27 Apr 2003 18:17:32 -0000 1.25
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/debugger.c,v 1.24 2002/11/12 06:05:07 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/debugger.c,v 1.25 2003/04/27 18:17:32 tsi Exp $ */
+
+ #include <ctype.h>
+-#include "io.h"
+-#include "debugger.h"
+-#include "write.h"
++#include "lisp/io.h"
++#include "lisp/debugger.h"
++#include "lisp/write.h"
+
+ #ifdef DEBUGGER
+ #define DebuggerHelp 0
+Index: xc/programs/xedit/lisp/debugger.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/debugger.h,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- xc/programs/xedit/lisp/debugger.h 8 Nov 2002 08:00:56 -0000 1.7
++++ xc/programs/xedit/lisp/debugger.h 27 Apr 2003 18:17:32 -0000 1.8
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/debugger.h,v 1.7 2002/11/08 08:00:56 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/debugger.h,v 1.8 2003/04/27 18:17:32 tsi Exp $ */
+
+ #ifndef Lisp_debugger_h
+ #define Lisp_debugger_h
+@@ -61,7 +61,7 @@
+ LispDebugBreakVariable
+ } LispDebugBreak;
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/format.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/format.c,v
+retrieving revision 1.28
+retrieving revision 1.30
+diff -u -r1.28 -r1.30
+--- xc/programs/xedit/lisp/format.c 30 Nov 2002 23:13:11 -0000 1.28
++++ xc/programs/xedit/lisp/format.c 27 May 2003 22:27:02 -0000 1.30
+@@ -27,11 +27,11 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/format.c,v 1.28 2002/11/30 23:13:11 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/format.c,v 1.30 2003/05/27 22:27:02 tsi Exp $ */
+
+-#include "io.h"
+-#include "write.h"
+-#include "format.h"
++#include "lisp/io.h"
++#include "lisp/write.h"
++#include "lisp/format.h"
+ #include <ctype.h>
+
+ #define MAXFMT 8
+@@ -596,9 +596,9 @@
+ format_in_radix(LispObj *stream, LispObj *object, int radix, FmtArgs *args)
+ {
+ if (INTEGERP(object)) {
+- int i, check, atsign, collon, mincol, padchar, commachar, commainterval;
++ int i, atsign, collon, mincol, padchar, commachar, commainterval;
+
+- i = check = (radix == 0);
++ i = (radix == 0);
+ atsign = args->atsign;
+ collon = args->collon;
+ if (radix == 0) {
+Index: xc/programs/xedit/lisp/format.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/format.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/xedit/lisp/format.h 8 Nov 2002 08:00:56 -0000 1.3
++++ xc/programs/xedit/lisp/format.h 27 Apr 2003 18:17:32 -0000 1.4
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/format.h,v 1.3 2002/11/08 08:00:56 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/format.h,v 1.4 2003/04/27 18:17:32 tsi Exp $ */
+
+ #ifndef Lisp_format_h
+ #define Lisp_format_h
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/hash.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/hash.c,v
+retrieving revision 1.4
+retrieving revision 1.6
+diff -u -r1.4 -r1.6
+--- xc/programs/xedit/lisp/hash.c 23 Nov 2002 08:26:48 -0000 1.4
++++ xc/programs/xedit/lisp/hash.c 17 Sep 2003 22:28:08 -0000 1.6
+@@ -27,9 +27,9 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/hash.c,v 1.4 2002/11/23 08:26:48 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/hash.c,v 1.6 2003/09/17 22:28:08 paulo Exp $ */
+
+-#include "hash.h"
++#include "lisp/hash.h"
+
+ /* A simple hash-table implementation
+ * TODO: implement SXHASH and WITH-HASH-TABLE-ITERATOR
+@@ -324,10 +324,12 @@
+ if ((nentry->count % 4) == 0) {
+ LispObj **keys, **values;
+
+- keys = realloc(nentry->keys, sizeof(LispObj*) * (i + 4));
++ keys = realloc(nentry->keys, sizeof(LispObj*) *
++ (nentry->count + 4));
+ if (keys == NULL)
+ goto out_of_memory;
+- values = realloc(nentry->values, sizeof(LispObj*) * (i + 4));
++ values = realloc(nentry->values, sizeof(LispObj*) *
++ (nentry->count + 4));
+ if (values == NULL) {
+ free(keys);
+ goto out_of_memory;
+@@ -529,6 +531,8 @@
+ test = ARGUMENT(0);
+
+ if (test != UNSPEC) {
++ if (FUNCTIONP(test))
++ test = test->data.atom->object;
+ if (test == Oeq)
+ function = FEQ;
+ else if (test == Oeql)
+Index: xc/programs/xedit/lisp/hash.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/hash.h,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- xc/programs/xedit/lisp/hash.h 8 Nov 2002 08:00:56 -0000 1.2
++++ xc/programs/xedit/lisp/hash.h 27 Apr 2003 18:17:33 -0000 1.3
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/hash.h,v 1.2 2002/11/08 08:00:56 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/hash.h,v 1.3 2003/04/27 18:17:33 tsi Exp $ */
+
+ #ifndef Lisp_hash_h
+ #define Lisp_hash_h
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ typedef struct _LispHashEntry {
+ LispObj **keys;
+Index: xc/programs/xedit/lisp/helper.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/helper.c,v
+retrieving revision 1.47
+retrieving revision 1.51
+diff -u -r1.47 -r1.51
+--- xc/programs/xedit/lisp/helper.c 26 Nov 2002 04:06:28 -0000 1.47
++++ xc/programs/xedit/lisp/helper.c 17 Sep 2003 22:28:08 -0000 1.51
+@@ -27,15 +27,15 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/helper.c,v 1.47 2002/11/26 04:06:28 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/helper.c,v 1.51 2003/09/17 22:28:08 paulo Exp $ */
+
+-#include "helper.h"
+-#include "pathname.h"
+-#include "package.h"
+-#include "read.h"
+-#include "stream.h"
+-#include "write.h"
+-#include "hash.h"
++#include "lisp/helper.h"
++#include "lisp/pathname.h"
++#include "lisp/package.h"
++#include "lisp/read.h"
++#include "lisp/stream.h"
++#include "lisp/write.h"
++#include "lisp/hash.h"
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <errno.h>
+@@ -691,14 +691,12 @@
+ do* init test &rest body
+ */
+ {
+- int jumped, *pjumped;
+- LispObj *result, **presult;
++ int jumped;
++ LispObj *result;
+ LispBlock *block;
+
+ jumped = 1;
+ result = NIL;
+- presult = &result;
+- pjumped = &jumped;
+ block = LispBeginBlock(NIL, LispBlockTag);
+ if (setjmp(block->jmp) == 0) {
+ result = LispReallyDo(builtin, refs);
+@@ -982,7 +980,7 @@
+
+ pathname = ARGUMENT(0);
+
+- if (PATHNAMEP(pathname))
++ if (!PATHNAMEP(pathname))
+ pathname = APPLY1(Oparse_namestring, pathname);
+
+ result = pathname->data.pathname;
+@@ -1062,8 +1060,12 @@
+ else if (STREAMP(pathname) && pathname->data.stream.type == LispStreamFile)
+ name = THESTR(CAR(pathname->data.stream.pathname->data.pathname));
+
++#ifndef __UNIXOS2__
+ if (realpath(name, &resolved[0]) == NULL ||
+ stat(resolved, &st)) {
++#else
++ if ((name == NULL) || stat(resolved, &st)) {
++#endif
+ if (probe)
+ return (NIL);
+ LispDestroy("%s: realpath(\"%s\"): %s",
+Index: xc/programs/xedit/lisp/helper.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/helper.h,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- xc/programs/xedit/lisp/helper.h 25 Nov 2002 02:35:30 -0000 1.15
++++ xc/programs/xedit/lisp/helper.h 27 Apr 2003 18:17:33 -0000 1.16
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/helper.h,v 1.15 2002/11/25 02:35:30 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/helper.h,v 1.16 2003/04/27 18:17:33 tsi Exp $ */
+
+ #ifndef Lisp_helper_h
+ #define Lisp_helper_h
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/internal.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/internal.h,v
+retrieving revision 1.49
+retrieving revision 1.51
+diff -u -r1.49 -r1.51
+--- xc/programs/xedit/lisp/internal.h 11 Dec 2002 04:44:27 -0000 1.49
++++ xc/programs/xedit/lisp/internal.h 27 May 2003 22:27:03 -0000 1.51
+@@ -27,13 +27,13 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/internal.h,v 1.49 2002/12/11 04:44:27 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/internal.h,v 1.51 2003/05/27 22:27:03 tsi Exp $ */
+
+ #ifndef Lisp_internal_h
+ #define Lisp_internal_h
+
+ #include <stdio.h>
+-#include "lisp.h"
++#include "lisp/lisp.h"
+
+ #include "mp.h"
+ #include "re.h"
+@@ -144,8 +144,9 @@
+ STRFUN(builtin), STROBJ(object))
+
+ #define XOBJECT_TYPE(object) ((object)->type)
+-#define OBJECT_TYPE(object) \
+- (POINTERP(object) ? XOBJECT_TYPE(object) : (long)(object) & BIT_MASK)
++#define OBJECT_TYPE(object) (POINTERP(object) ? \
++ XOBJECT_TYPE(object) : \
++ (LispType)((long)(object) & BIT_MASK))
+
+
+ #define NIL (LispObj*)0x00000001
+@@ -558,7 +559,7 @@
+ struct {
+ char *string;
+ long length;
+- int writable : 1;
++ unsigned int writable : 1;
+ } string;
+ long integer;
+ double dfloat;
+@@ -608,8 +609,8 @@
+ } source;
+ LispObj *pathname;
+ LispStreamType type : 6;
+- int readable : 1;
+- int writable : 1;
++ unsigned int readable : 1;
++ unsigned int writable : 1;
+ } stream;
+ struct {
+ void *data;
+Index: xc/programs/xedit/lisp/io.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/io.c,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff -u -r1.16 -r1.17
+--- xc/programs/xedit/lisp/io.c 16 Dec 2002 03:59:27 -0000 1.16
++++ xc/programs/xedit/lisp/io.c 27 Apr 2003 18:17:33 -0000 1.17
+@@ -27,9 +27,9 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/io.c,v 1.16 2002/12/16 03:59:27 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/io.c,v 1.17 2003/04/27 18:17:33 tsi Exp $ */
+
+-#include "io.h"
++#include "lisp/io.h"
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
+Index: xc/programs/xedit/lisp/io.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/io.h,v
+retrieving revision 1.8
+retrieving revision 1.10
+diff -u -r1.8 -r1.10
+--- xc/programs/xedit/lisp/io.h 6 Dec 2002 03:25:27 -0000 1.8
++++ xc/programs/xedit/lisp/io.h 27 May 2003 22:27:03 -0000 1.10
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/io.h,v 1.8 2002/12/06 03:25:27 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/io.h,v 1.10 2003/05/27 22:27:03 tsi Exp $ */
+
+ #ifndef Lisp_io_h
+ #define Lisp_io_h
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ #define FILE_READ 0x01
+ #define FILE_WRITE 0x02
+@@ -55,13 +55,13 @@
+ int length; /* number of bytes used */
+ int offset; /* read/write offset */
+ int unget : 8; /* unread char */
+- int readable : 1;
+- int writable : 1;
+- int regular : 1; /* regular file */
+- int buffered : 1;
+- int available : 1; /* unget field holds a char */
+- int nonblock : 1; /* in nonblock mode */
+- int binary : 1; /* if set, don't calculate column/line-number */
++ unsigned int readable : 1;
++ unsigned int writable : 1;
++ unsigned int regular : 1; /* regular file */
++ unsigned int buffered : 1;
++ unsigned int available : 1; /* unget field holds a char */
++ unsigned int nonblock : 1; /* in nonblock mode */
++ unsigned int binary : 1; /* if set, don't calculate column/line-number */
+ io_write_fn io_write;
+ };
+
+@@ -73,8 +73,8 @@
+ int length; /* number of bytes used */
+ int input; /* input offset, for read operations */
+ int output; /* output offset, for write operations */
+- int fixed : 1; /* if set, don't try to reallocate string */
+- int binary : 1; /* if set, don't calculate column/line-number */
++ unsigned int fixed : 1; /* if set, don't try to reallocate string */
++ unsigned int binary : 1; /* if set, don't calculate column/line-number */
+ };
+
+ /*
+Index: xc/programs/xedit/lisp/lisp.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/lisp.c,v
+retrieving revision 1.85
+retrieving revision 1.89
+diff -u -r1.85 -r1.89
+--- xc/programs/xedit/lisp/lisp.c 29 Jan 2003 03:05:53 -0000 1.85
++++ xc/programs/xedit/lisp/lisp.c 2 Oct 2003 13:30:13 -0000 1.89
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/lisp.c,v 1.85 2003/01/29 03:05:53 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/lisp.c,v 1.89 2003/10/02 13:30:13 eich Exp $ */
+
+ #include <stdlib.h>
+ #include <string.h>
+@@ -67,20 +67,20 @@
+ #define HAS_SC_PAGESIZE
+ #endif
+
+-#include "bytecode.h"
++#include "lisp/bytecode.h"
+
+-#include "read.h"
+-#include "format.h"
+-#include "math.h"
+-#include "hash.h"
+-#include "package.h"
+-#include "pathname.h"
+-#include "regex.h"
+-#include "require.h"
+-#include "stream.h"
+-#include "struct.h"
+-#include "time.h"
+-#include "write.h"
++#include "lisp/read.h"
++#include "lisp/format.h"
++#include "lisp/math.h"
++#include "lisp/hash.h"
++#include "lisp/package.h"
++#include "lisp/pathname.h"
++#include "lisp/regex.h"
++#include "lisp/require.h"
++#include "lisp/stream.h"
++#include "lisp/struct.h"
++#include "lisp/time.h"
++#include "lisp/write.h"
+ #include <math.h>
+
+ typedef struct {
+@@ -1415,11 +1415,11 @@
+ /* if atom->property is NOPROPERTY, this is an unbound symbol */
+ return;
+
+- --atom->property->refcount;
+-
+- if (atom->property->refcount < 0)
++ if (atom->property->refcount <= 0)
+ LispDestroy("internal error at DECREMENT-ATOM-REFERENCE");
+
++ --atom->property->refcount;
++
+ if (atom->property->refcount == 0) {
+ LispRemAtomAllProperties(atom);
+ free(atom->property);
+@@ -2630,7 +2630,8 @@
+
+ obj = objseg.freeobj;
+ objseg.freeobj = CDR(obj);
+-
++ --objseg.nfree;
++
+ return (obj);
+ }
+
+@@ -2641,9 +2642,11 @@
+
+ if (obj == NIL)
+ obj = Lisp__New(car, cdr);
+- else
++ else {
+ objseg.freeobj = CDR(obj);
+-
++ --objseg.nfree;
++ }
++
+ return (obj);
+ }
+
+@@ -2782,9 +2785,10 @@
+
+ if (dfloat == NIL)
+ dfloat = Lisp__New(NIL, NIL);
+- else
++ else {
+ objseg.freeobj = CDR(dfloat);
+-
++ --objseg.nfree;
++ }
+ dfloat->type = LispDFloat_t;
+ dfloat->data.dfloat = value;
+
+@@ -2799,9 +2803,10 @@
+
+ if (string == NIL)
+ string = Lisp__New(NIL, NIL);
+- else
++ else {
+ objseg.freeobj = CDR(string);
+-
++ --objseg.nfree;
++ }
+ if (alloced)
+ cstring = str;
+ else {
+@@ -2825,9 +2830,10 @@
+
+ if (complexp == NIL)
+ complexp = Lisp__New(realpart, imagpart);
+- else
++ else {
+ objseg.freeobj = CDR(complexp);
+-
++ --objseg.nfree;
++ }
+ complexp->type = LispComplex_t;
+ complexp->data.complex.real = realpart;
+ complexp->data.complex.imag = imagpart;
+@@ -2843,9 +2849,10 @@
+
+ if (object == NIL)
+ object = Lisp__New(NIL, NIL);
+- else
++ else {
+ objseg.freeobj = CDR(object);
+-
++ --objseg.nfree;
++ }
+ object->type = LispInteger_t;
+ object->data.integer = integer;
+
+@@ -2861,9 +2868,10 @@
+
+ if (ratio == NIL)
+ ratio = Lisp__New(NIL, NIL);
+- else
++ else {
+ objseg.freeobj = CDR(ratio);
+-
++ --objseg.nfree;
++ }
+ ratio->type = LispRatio_t;
+ ratio->data.ratio.numerator = num;
+ ratio->data.ratio.denominator = den;
+@@ -2936,9 +2944,10 @@
+
+ if (cons == NIL)
+ cons = Lisp__New(car, cdr);
+- else
++ else {
+ objseg.freeobj = CDR(cons);
+-
++ --objseg.nfree;
++ }
+ CAR(cons) = car;
+ CDR(cons) = cdr;
+
+@@ -3180,10 +3189,8 @@
+ int ii;
+ char *string;
+ LispAtom *atom;
+- LispProperty *property;
+
+ string = ATOMID(symbol);
+- property = symbol->data.atom->property;
+ ii = STRHASH(string);
+
+ atom = lisp__data.pack->atoms[ii];
+@@ -4860,15 +4867,13 @@
+
+ if (!macro) {
+ int lex = lisp__data.env.lex;
+- int did_jump = 1, *pdid_jump;
+- LispObj **pcode, **presult;
++ int did_jump = 1;
+ LispBlock *block;
+
+ block = LispBeginBlock(name, LispBlockClosure);
+ lisp__data.env.lex = base;
+ if (setjmp(block->jmp) == 0) {
+- for (pcode = &code, presult = &result, pdid_jump = &did_jump;
+- CONSP(code); code = CDR(code))
++ for (; CONSP(code); code = CDR(code))
+ result = EVAL(CAR(code));
+ did_jump = 0;
+ }
+Index: xc/programs/xedit/lisp/lsp.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/lsp.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- xc/programs/xedit/lisp/lsp.c 23 Nov 2002 08:26:49 -0000 1.7
++++ xc/programs/xedit/lisp/lsp.c 27 Apr 2003 18:17:33 -0000 1.8
+@@ -27,11 +27,11 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/lsp.c,v 1.7 2002/11/23 08:26:49 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/lsp.c,v 1.8 2003/04/27 18:17:33 tsi Exp $ */
+
+ #include <stdio.h>
+ #include <string.h>
+-#include "lisp.h"
++#include "lisp/lisp.h"
+
+ #ifdef NEED_STRCASECMP
+ int strcasecmp(const char *s1, const char *s2);
+Index: xc/programs/xedit/lisp/math.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/math.c,v
+retrieving revision 1.22
+retrieving revision 1.24
+diff -u -r1.22 -r1.24
+--- xc/programs/xedit/lisp/math.c 23 Nov 2002 21:41:52 -0000 1.22
++++ xc/programs/xedit/lisp/math.c 27 Apr 2003 18:17:33 -0000 1.24
+@@ -27,10 +27,14 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/math.c,v 1.22 2002/11/23 21:41:52 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/math.c,v 1.24 2003/04/27 18:17:33 tsi Exp $ */
+
+-#include "math.h"
+-#include "private.h"
++#include "lisp/math.h"
++#include "lisp/private.h"
++
++#ifdef __UNIXOS2__
++# define finite(x) isfinite(x)
++#endif
+
+ /*
+ * Prototypes
+@@ -50,7 +54,7 @@
+ /*
+ * Implementation
+ */
+-#include "mathimp.c"
++#include "lisp/mathimp.c"
+
+ void
+ LispMathInit(void)
+Index: xc/programs/xedit/lisp/math.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/math.h,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- xc/programs/xedit/lisp/math.h 8 Nov 2002 08:00:57 -0000 1.6
++++ xc/programs/xedit/lisp/math.h 27 Apr 2003 18:17:33 -0000 1.7
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/math.h,v 1.6 2002/11/08 08:00:57 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/math.h,v 1.7 2003/04/27 18:17:33 tsi Exp $ */
+
+ #ifndef Lisp_math_h
+ #define Lisp_math_h
+
+-#include "internal.h"
++#include "lisp/internal.h"
+ #include "mp.h"
+
+ void LispMathInit(void);
+Index: xc/programs/xedit/lisp/package.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/package.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- xc/programs/xedit/lisp/package.c 30 Nov 2002 23:13:12 -0000 1.20
++++ xc/programs/xedit/lisp/package.c 27 Apr 2003 18:17:34 -0000 1.21
+@@ -27,10 +27,10 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/package.c,v 1.20 2002/11/30 23:13:12 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/package.c,v 1.21 2003/04/27 18:17:34 tsi Exp $ */
+
+-#include "package.h"
+-#include "private.h"
++#include "lisp/package.h"
++#include "lisp/private.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/package.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/package.h,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- xc/programs/xedit/lisp/package.h 26 Nov 2002 04:06:28 -0000 1.7
++++ xc/programs/xedit/lisp/package.h 27 Apr 2003 18:17:34 -0000 1.8
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/package.h,v 1.7 2002/11/26 04:06:28 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/package.h,v 1.8 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_package_h
+ #define Lisp_package_h
+
+-#include "internal.h"
++#include "lisp/internal.h"
+
+ void LispPackageInit(void);
+ LispObj *LispFindPackage(LispObj*);
+Index: xc/programs/xedit/lisp/pathname.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/pathname.c,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- xc/programs/xedit/lisp/pathname.c 24 Dec 2002 00:25:39 -0000 1.17
++++ xc/programs/xedit/lisp/pathname.c 27 Apr 2003 18:17:34 -0000 1.18
+@@ -27,15 +27,15 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/pathname.c,v 1.17 2002/12/24 00:25:39 dawes Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/pathname.c,v 1.18 2003/04/27 18:17:34 tsi Exp $ */
+
+-#include <stdio.h> /* including dirent.h first may cause problems */
++#include <stdio.h> /* including dirent.h first may cause problems */
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+-#include "pathname.h"
+-#include "private.h"
++#include "lisp/pathname.h"
++#include "lisp/private.h"
+
+ #define NOREAD_SKIP 0
+ #define NOREAD_ERROR 1
+Index: xc/programs/xedit/lisp/pathname.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/pathname.h,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- xc/programs/xedit/lisp/pathname.h 8 Nov 2002 08:00:57 -0000 1.4
++++ xc/programs/xedit/lisp/pathname.h 27 Apr 2003 18:17:34 -0000 1.5
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/pathname.h,v 1.4 2002/11/08 08:00:57 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/pathname.h,v 1.5 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_pathname_h
+ #define Lisp_pathname_h
+
+-#include "internal.h"
++#include "lisp/internal.h"
+
+ #define PATH_SEP '/'
+ #define PATH_TYPESEP '.'
+Index: xc/programs/xedit/lisp/private.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/private.h,v
+retrieving revision 1.39
+retrieving revision 1.41
+diff -u -r1.39 -r1.41
+--- xc/programs/xedit/lisp/private.h 20 Dec 2002 04:32:46 -0000 1.39
++++ xc/programs/xedit/lisp/private.h 27 May 2003 22:27:04 -0000 1.41
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.39 2002/12/20 04:32:46 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.41 2003/05/27 22:27:04 tsi Exp $ */
+
+ #ifndef Lisp_private_h
+ #define Lisp_private_h
+@@ -38,15 +38,15 @@
+ #include <setjmp.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+-#include "internal.h"
++#include "lisp/internal.h"
+
+-#include "core.h"
++#include "lisp/core.h"
+ #ifdef DEBUGGER
+-#include "debugger.h"
++#include "lisp/debugger.h"
+ #endif
+-#include "helper.h"
+-#include "string.h"
+-#include "struct.h"
++#include "lisp/helper.h"
++#include "lisp/string.h"
++#include "lisp/struct.h"
+
+ /*
+ * Defines
+@@ -55,10 +55,10 @@
+ #define MULTIPLE_VALUES_LIMIT 127
+ #define MAX_STACK_DEPTH 16384
+
+-#define FEATURES \
+- lisp__data.features->data.atom->a_object ? \
+- lisp__data.features->data.atom->property->value : \
+- NIL
++#define FEATURES \
++ (lisp__data.features->data.atom->a_object ? \
++ (LispObj *)lisp__data.features->data.atom->property->value : \
++ NIL)
+ #define PACK lisp__data.packlist
+ #define PACKAGE lisp__data.package->data.atom->property->value
+ #define MOD lisp__data.modlist
+Index: xc/programs/xedit/lisp/read.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/read.c,v
+retrieving revision 1.34
+retrieving revision 1.37
+diff -u -r1.34 -r1.37
+--- xc/programs/xedit/lisp/read.c 13 Jan 2003 03:57:58 -0000 1.34
++++ xc/programs/xedit/lisp/read.c 27 May 2003 22:27:04 -0000 1.37
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/read.c,v 1.34 2003/01/13 03:57:58 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/read.c,v 1.37 2003/05/27 22:27:04 tsi Exp $ */
+
+ #include <errno.h>
+-#include "read.h"
+-#include "package.h"
+-#include "write.h"
++#include "lisp/read.h"
++#include "lisp/package.h"
++#include "lisp/write.h"
+ #include <fcntl.h>
+ #include <stdarg.h>
+
+@@ -62,6 +62,10 @@
+ #define READ_ERROR_FIXNUM() READ_ERROR0("number is not a fixnum")
+ #define READ_ERROR_INVARG() READ_ERROR0("invalid argument")
+
++#ifdef __UNIXOS2__
++# define finite(x) isfinite(x)
++#endif
++
+ /*
+ * Types
+ */
+@@ -251,9 +255,8 @@
+ {
+ LispObj *result;
+
+- LispObj *input_stream, *eof_error_p, *eof_value, *recursive_p;
++ LispObj *input_stream, *eof_error_p, *eof_value;
+
+- recursive_p = ARGUMENT(3);
+ eof_value = ARGUMENT(2);
+ eof_error_p = ARGUMENT(1);
+ input_stream = ARGUMENT(0);
+@@ -294,11 +297,9 @@
+ LispReadChar(LispBuiltin *builtin, int nohang)
+ {
+ int character;
+- LispObj *result;
+
+- LispObj *input_stream, *eof_error_p, *eof_value, *recursive_p;
++ LispObj *input_stream, *eof_error_p, *eof_value;
+
+- recursive_p = ARGUMENT(3);
+ eof_value = ARGUMENT(2);
+ eof_error_p = ARGUMENT(1);
+ input_stream = ARGUMENT(0);
+@@ -314,7 +315,6 @@
+ if (eof_value == UNSPEC)
+ eof_value = NIL;
+
+- result = NIL;
+ character = EOF;
+
+ if (input_stream->data.stream.readable) {
+@@ -410,9 +410,8 @@
+ int ch, length;
+ LispObj *result, *status = NIL;
+
+- LispObj *input_stream, *eof_error_p, *eof_value, *recursive_p;
++ LispObj *input_stream, *eof_error_p, *eof_value;
+
+- recursive_p = ARGUMENT(3);
+ eof_value = ARGUMENT(2);
+ eof_error_p = ARGUMENT(1);
+ input_stream = ARGUMENT(0);
+Index: xc/programs/xedit/lisp/read.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/read.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/xedit/lisp/read.h 15 Nov 2002 07:01:30 -0000 1.3
++++ xc/programs/xedit/lisp/read.h 27 Apr 2003 18:17:34 -0000 1.4
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/read.h,v 1.3 2002/11/15 07:01:30 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/read.h,v 1.4 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_read_h
+ #define Lisp_read_h
+
+-#include "io.h"
++#include "lisp/io.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/regex.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/regex.c,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- xc/programs/xedit/lisp/regex.c 11 Dec 2002 04:44:28 -0000 1.10
++++ xc/programs/xedit/lisp/regex.c 27 Apr 2003 18:17:34 -0000 1.11
+@@ -27,11 +27,11 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/regex.c,v 1.10 2002/12/11 04:44:28 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/regex.c,v 1.11 2003/04/27 18:17:34 tsi Exp $ */
+
+-#include "regex.h"
+-#include "private.h"
+-#include "helper.h"
++#include "lisp/regex.h"
++#include "lisp/private.h"
++#include "lisp/helper.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/regex.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/regex.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/xedit/lisp/regex.h 8 Nov 2002 08:00:57 -0000 1.3
++++ xc/programs/xedit/lisp/regex.h 27 Apr 2003 18:17:34 -0000 1.4
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/regex.h,v 1.3 2002/11/08 08:00:57 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/regex.h,v 1.4 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_regex_h
+ #define Lisp_regex_h
+
+-#include "internal.h"
++#include "lisp/internal.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/require.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/require.c,v
+retrieving revision 1.16
+retrieving revision 1.18
+diff -u -r1.16 -r1.18
+--- xc/programs/xedit/lisp/require.c 23 Nov 2002 08:26:50 -0000 1.16
++++ xc/programs/xedit/lisp/require.c 27 Apr 2003 18:17:34 -0000 1.18
+@@ -27,9 +27,9 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/require.c,v 1.16 2002/11/23 08:26:50 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/require.c,v 1.18 2003/04/27 18:17:34 tsi Exp $ */
+
+-#include "require.h"
++#include "lisp/require.h"
+
+ /*
+ * Implementation
+@@ -120,13 +120,13 @@
+ if (lisp__data.module == NULL) {
+ /* export our own symbols */
+ if (dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL) == NULL)
+- LispDestroy(mac, "%s: ", STRFUN(builtin), dlerror());
++ LispDestroy("%s: ", STRFUN(builtin), dlerror());
+ }
+
+ lisp_module = (LispModule*)LispMalloc(sizeof(LispModule));
+ if ((lisp_module->handle =
+ dlopen(filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL)
+- LispDestroy(mac, "%s: dlopen: %s", STRFUN(builtin), dlerror());
++ LispDestroy("%s: dlopen: %s", STRFUN(builtin), dlerror());
+ snprintf(data, sizeof(data), "%sLispModuleData", THESTR(module));
+ if ((lisp_module->data =
+ (LispModuleData*)dlsym(lisp_module->handle, data)) == NULL) {
+Index: xc/programs/xedit/lisp/require.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/require.h,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- xc/programs/xedit/lisp/require.h 8 Nov 2002 08:00:57 -0000 1.4
++++ xc/programs/xedit/lisp/require.h 27 Apr 2003 18:17:34 -0000 1.5
+@@ -27,13 +27,13 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/require.h,v 1.4 2002/11/08 08:00:57 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/require.h,v 1.5 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_require_h
+ #define Lisp_require_h
+
+-#include "private.h"
+-#include "helper.h"
++#include "lisp/private.h"
++#include "lisp/helper.h"
+ #ifdef SHARED_MODULES
+ #include <dlfcn.h>
+ #endif
+Index: xc/programs/xedit/lisp/stream.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/stream.c,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- xc/programs/xedit/lisp/stream.c 10 Dec 2002 03:59:03 -0000 1.21
++++ xc/programs/xedit/lisp/stream.c 27 Apr 2003 18:17:34 -0000 1.22
+@@ -27,13 +27,13 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/stream.c,v 1.21 2002/12/10 03:59:03 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/stream.c,v 1.22 2003/04/27 18:17:34 tsi Exp $ */
+
+-#include "read.h"
+-#include "stream.h"
+-#include "pathname.h"
+-#include "write.h"
+-#include "private.h"
++#include "lisp/read.h"
++#include "lisp/stream.h"
++#include "lisp/pathname.h"
++#include "lisp/write.h"
++#include "lisp/private.h"
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <signal.h>
+Index: xc/programs/xedit/lisp/stream.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/stream.h,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- xc/programs/xedit/lisp/stream.h 6 Dec 2002 03:25:27 -0000 1.8
++++ xc/programs/xedit/lisp/stream.h 27 Apr 2003 18:17:34 -0000 1.9
+@@ -27,13 +27,13 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/stream.h,v 1.8 2002/12/06 03:25:27 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/stream.h,v 1.9 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_stream_h
+ #define Lisp_stream_h
+
+-#include "io.h"
+-#include "internal.h"
++#include "lisp/io.h"
++#include "lisp/internal.h"
+
+ void LispStreamInit(void);
+
+Index: xc/programs/xedit/lisp/string.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/string.c,v
+retrieving revision 1.22
+retrieving revision 1.25
+diff -u -r1.22 -r1.25
+--- xc/programs/xedit/lisp/string.c 4 Dec 2002 05:27:58 -0000 1.22
++++ xc/programs/xedit/lisp/string.c 27 May 2003 22:27:04 -0000 1.25
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/string.c,v 1.22 2002/12/04 05:27:58 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/string.c,v 1.25 2003/05/27 22:27:04 tsi Exp $ */
+
+-#include "helper.h"
+-#include "read.h"
+-#include "string.h"
+-#include "private.h"
++#include "lisp/helper.h"
++#include "lisp/read.h"
++#include "lisp/string.h"
++#include "lisp/private.h"
+ #include <ctype.h>
+
+ #define CHAR_LESS 1
+@@ -549,9 +549,8 @@
+ long length;
+ char *string, initial;
+
+- LispObj *size, *initial_element, *element_type;
++ LispObj *size, *initial_element;
+
+- element_type = ARGUMENT(2);
+ initial_element = ARGUMENT(1);
+ size = ARGUMENT(0);
+
+@@ -598,6 +597,12 @@
+ LispCheckSequenceStartEnd(builtin, ostring, ostart, oend,
+ &start, &end, &length);
+ string = THESTR(ostring);
++ if (oradix == UNSPEC)
++ radix = 10;
++ else {
++ CHECK_INDEX(oradix);
++ radix = FIXNUM_VALUE(oradix);
++ }
+ if (radix < 2 || radix > 36)
+ LispDestroy("%s: :RADIX %ld must be in the range 2 to 36",
+ STRFUN(builtin), radix);
+@@ -725,10 +730,8 @@
+ LispObj *stream, *result;
+ long length, start, end, bytes_read;
+
+- LispObj *ostring, *eof_error_p, *eof_value,
+- *ostart, *oend, *preserve_white_space;
++ LispObj *ostring, *eof_error_p, *eof_value, *ostart, *oend;
+
+- preserve_white_space = ARGUMENT(5);
+ oend = ARGUMENT(4);
+ ostart = ARGUMENT(3);
+ eof_value = ARGUMENT(2);
+Index: xc/programs/xedit/lisp/string.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/string.h,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- xc/programs/xedit/lisp/string.h 25 Nov 2002 02:35:30 -0000 1.11
++++ xc/programs/xedit/lisp/string.h 27 Apr 2003 18:17:34 -0000 1.12
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/string.h,v 1.11 2002/11/25 02:35:30 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/string.h,v 1.12 2003/04/27 18:17:34 tsi Exp $ */
+
+ #ifndef Lisp_string_h
+ #define Lisp_string_h
+
+-#include "internal.h"
++#include "lisp/internal.h"
+
+ LispObj *Lisp_AlphaCharP(LispBuiltin*);
+ LispObj *Lisp_BothCaseP(LispBuiltin*);
+Index: xc/programs/xedit/lisp/struct.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/struct.c,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -r1.22 -r1.23
+--- xc/programs/xedit/lisp/struct.c 23 Nov 2002 08:26:50 -0000 1.22
++++ xc/programs/xedit/lisp/struct.c 27 Apr 2003 18:17:34 -0000 1.23
+@@ -27,9 +27,9 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/struct.c,v 1.22 2002/11/23 08:26:50 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/struct.c,v 1.23 2003/04/27 18:17:34 tsi Exp $ */
+
+-#include "struct.h"
++#include "lisp/struct.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/struct.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/struct.h,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- xc/programs/xedit/lisp/struct.h 10 Nov 2002 16:29:07 -0000 1.6
++++ xc/programs/xedit/lisp/struct.h 27 Apr 2003 18:17:35 -0000 1.7
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/struct.h,v 1.6 2002/11/10 16:29:07 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/struct.h,v 1.7 2003/04/27 18:17:35 tsi Exp $ */
+
+ #ifndef Lisp_struct_h
+ #define Lisp_struct_h
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ /*
+ * Defines
+Index: xc/programs/xedit/lisp/time.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/time.c,v
+retrieving revision 1.7
+retrieving revision 1.10
+diff -u -r1.7 -r1.10
+--- xc/programs/xedit/lisp/time.c 8 Nov 2002 08:00:57 -0000 1.7
++++ xc/programs/xedit/lisp/time.c 27 Apr 2003 18:17:35 -0000 1.10
+@@ -27,10 +27,10 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/time.c,v 1.7 2002/11/08 08:00:57 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/time.c,v 1.10 2003/04/27 18:17:35 tsi Exp $ */
+
+-#include "time.h"
+-#include "bytecode.h"
++#include "lisp/time.h"
++#include "lisp/bytecode.h"
+
+ /*
+ * Implementation
+@@ -41,6 +41,7 @@
+ time form
+ */
+ {
++#ifndef __UNIXOS2__
+ struct itimerval real, virt, prof;
+ unsigned long count;
+ long sec, usec;
+@@ -135,4 +136,8 @@
+ lisp__data.gc.timebits = 0;
+
+ return (result);
++#else
++ LispMessage("\"Lisp_Time\" not implemented under OS/2");
++ return (NIL);
++#endif
+ }
+Index: xc/programs/xedit/lisp/time.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/time.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/xedit/lisp/time.h 8 Nov 2002 08:00:57 -0000 1.3
++++ xc/programs/xedit/lisp/time.h 27 Apr 2003 18:17:35 -0000 1.4
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/time.h,v 1.3 2002/11/08 08:00:57 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/time.h,v 1.4 2003/04/27 18:17:35 tsi Exp $ */
+
+ #ifndef Lisp_time_h
+ #define Lisp_time_h
+
+-#include "private.h"
++#include "lisp/private.h"
+
+ LispObj *Lisp_Time(LispBuiltin*);
+
+Index: xc/programs/xedit/lisp/write.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/write.c,v
+retrieving revision 1.30
+retrieving revision 1.32
+diff -u -r1.30 -r1.32
+--- xc/programs/xedit/lisp/write.c 4 Dec 2002 18:43:19 -0000 1.30
++++ xc/programs/xedit/lisp/write.c 27 May 2003 22:27:04 -0000 1.32
+@@ -27,10 +27,10 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/write.c,v 1.30 2002/12/04 18:43:19 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/write.c,v 1.32 2003/05/27 22:27:04 tsi Exp $ */
+
+-#include "write.h"
+-#include "hash.h"
++#include "lisp/write.h"
++#include "lisp/hash.h"
+ #include <math.h>
+ #include <ctype.h>
+
+@@ -258,14 +258,9 @@
+ {
+ int head = lisp__data.env.length;
+
+- LispObj *object, *ocase, *circle, *escape, *length, *level,
+- *lines, *pretty, *readably, *right_margin, *stream;
++ LispObj *object, *ocase, *circle, *escape, *length, *level, *stream;
+
+ stream = ARGUMENT(10);
+- right_margin = ARGUMENT(9); /* yet unused */
+- readably = ARGUMENT(8); /* yet unused */
+- pretty = ARGUMENT(7); /* yet unused */
+- lines = ARGUMENT(6); /* yet unused */
+ level = ARGUMENT(5);
+ length = ARGUMENT(4);
+ escape = ARGUMENT(3);
+Index: xc/programs/xedit/lisp/write.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/write.h,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- xc/programs/xedit/lisp/write.h 4 Dec 2002 05:27:59 -0000 1.9
++++ xc/programs/xedit/lisp/write.h 27 Apr 2003 18:17:35 -0000 1.10
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/write.h,v 1.9 2002/12/04 05:27:59 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/write.h,v 1.10 2003/04/27 18:17:35 tsi Exp $ */
+
+ #ifndef Lisp_write_h
+ #define Lisp_write_h
+
+-#include "io.h"
++#include "lisp/io.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/xedit.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/xedit.c,v
+retrieving revision 1.24
+retrieving revision 1.26
+diff -u -r1.24 -r1.26
+--- xc/programs/xedit/lisp/xedit.c 13 Jan 2003 03:57:59 -0000 1.24
++++ xc/programs/xedit/lisp/xedit.c 20 May 2003 21:44:48 -0000 1.26
+@@ -27,14 +27,14 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/xedit.c,v 1.24 2003/01/13 03:57:59 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/xedit.c,v 1.26 2003/05/20 21:44:48 tsi Exp $ */
+
+-#include "../xedit.h"
++#include "xedit/xedit.h"
+ #include <X11/Xaw/TextSrcP.h> /* Needs some private definitions */
+ #include <X11/Xaw/TextSinkP.h> /* Also needs private definitions... */
+ #include <X11/Xmu/Xmu.h>
+ #define XEDIT_LISP_PRIVATE
+-#include "xedit.h"
++#include "lisp/xedit.h"
+ #include <signal.h>
+
+ /* Initialize to enter lisp */
+Index: xc/programs/xedit/lisp/xedit.h
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/xedit.h,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- xc/programs/xedit/lisp/xedit.h 10 Nov 2002 23:22:00 -0000 1.5
++++ xc/programs/xedit/lisp/xedit.h 27 Apr 2003 18:17:35 -0000 1.6
+@@ -27,16 +27,16 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/xedit.h,v 1.5 2002/11/10 23:22:00 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/xedit.h,v 1.6 2003/04/27 18:17:35 tsi Exp $ */
+
+ #ifndef Lisp_xedit_h
+ #define Lisp_xedit_h
+
+ #ifdef XEDIT_LISP_PRIVATE
+-#include "private.h"
+-#include "io.h"
+-#include "read.h"
+-#include "write.h"
++#include "lisp/private.h"
++#include "lisp/io.h"
++#include "lisp/read.h"
++#include "lisp/write.h"
+
+ LispObj *Xedit_AddEntity(LispBuiltin*);
+ LispObj *Xedit_AutoFill(LispBuiltin*);
+Index: xc/programs/xedit/lisp/modules/Imakefile
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/modules/Imakefile,v
+retrieving revision 1.13
+retrieving revision 1.16
+diff -u -r1.13 -r1.16
+--- xc/programs/xedit/lisp/modules/Imakefile 16 Jan 2003 06:25:49 -0000 1.13
++++ xc/programs/xedit/lisp/modules/Imakefile 27 May 2003 22:27:05 -0000 1.16
+@@ -1,11 +1,14 @@
+-XCOMM $XFree86: xc/programs/xedit/lisp/modules/Imakefile,v 1.13 2003/01/16 06:25:49 paulo Exp $
++XCOMM $XFree86: xc/programs/xedit/lisp/modules/Imakefile,v 1.16 2003/05/27 22:27:05 tsi Exp $
+
+ #include "../lisp.cf"
+ #include "../lisp.rules"
+
+-INCLUDES = -I.. -I../mp -I$(XINCLUDESRC) -I-
+-
+ #if BuildSharedLispModules
++
++ SRCS = x11.c xt.c xaw.c
++ OBJS = x11.o xt.o xaw.o
++INCLUDES = -I../.. -I../mp -I../re -I$(XINCLUDESRC)
++
+ LispModuleTarget(x11, $(XLIB) $(LOCAL_LIBRARIES),)
+ LispModuleTarget(xt, $(XTOOLLIB) $(XLIB) $(LOCAL_LIBRARIES),)
+ LispModuleTarget(xaw, $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(LOCAL_LIBRARIES),)
+@@ -13,7 +16,10 @@
+ InstallMultipleFlags(x11.so,$(LISPDIR),$(INSTINCFLAGS))
+ InstallMultipleFlags(xt.so,$(LISPDIR),$(INSTINCFLAGS))
+ InstallMultipleFlags(xaw.so,$(LISPDIR),$(INSTINCFLAGS))
+-#endif
++
++DependTarget()
++
++#endif /* InstallSharedLispModules */
+
+ InstallMultipleFlags(lisp.lsp,$(LISPDIR),$(INSTINCFLAGS))
+ InstallMultipleFlags(xedit.lsp,$(LISPDIR),$(INSTINCFLAGS))
+Index: xc/programs/xedit/lisp/modules/psql.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/modules/psql.c,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- xc/programs/xedit/lisp/modules/psql.c 23 Nov 2002 08:26:52 -0000 1.12
++++ xc/programs/xedit/lisp/modules/psql.c 27 Apr 2003 18:17:37 -0000 1.13
+@@ -27,15 +27,15 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/modules/psql.c,v 1.12 2002/11/23 08:26:52 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/modules/psql.c,v 1.13 2003/04/27 18:17:37 tsi Exp $ */
+
+ #include <stdlib.h>
+ #include <libpq-fe.h>
+ #undef USE_SSL /* cannot get it to compile... */
+ #include <postgres.h>
+ #include <utils/geo_decls.h>
+-#include "internal.h"
+-#include "private.h"
++#include "lisp/internal.h"
++#include "lisp/private.h"
+
+ /*
+ * Prototypes
+Index: xc/programs/xedit/lisp/modules/x11.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/modules/x11.c,v
+retrieving revision 1.10
+retrieving revision 1.12
+diff -u -r1.10 -r1.12
+--- xc/programs/xedit/lisp/modules/x11.c 23 Nov 2002 08:26:52 -0000 1.10
++++ xc/programs/xedit/lisp/modules/x11.c 27 Apr 2003 18:17:37 -0000 1.12
+@@ -27,12 +27,12 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/modules/x11.c,v 1.10 2002/11/23 08:26:52 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/modules/x11.c,v 1.12 2003/04/27 18:17:37 tsi Exp $ */
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include "internal.h"
+-#include "private.h"
++#include "lisp/internal.h"
++#include "lisp/private.h"
+ #include <X11/Xlib.h>
+
+ /*
+@@ -228,10 +228,10 @@
+
+ if (oscreen == UNSPEC)
+ screen = DefaultScreen(display);
+- else
++ else {
+ CHECK_INDEX(oscreen);
+- else
+ screen = FIXNUM_VALUE(oscreen);
++ }
+
+ if (screen >= ScreenCount(display))
+ LispDestroy("%s: screen index %d too large, %d screens available",
+@@ -278,10 +278,10 @@
+
+ if (oscreen == UNSPEC)
+ screen = DefaultScreen(display);
+- else
++ else {
+ CHECK_FIXNUM(oscreen);
+- else
+ screen = FIXNUM_VALUE(oscreen);
++ }
+
+ if (screen >= ScreenCount(display))
+ LispDestroy("%s: screen index %d too large, %d screens available",
+@@ -328,10 +328,10 @@
+
+ if (oscreen == UNSPEC)
+ screen = DefaultScreen(display);
+- else
++ else {
+ CHECK_FIXNUM(oscreen);
+- else
+ screen = FIXNUM_VALUE(oscreen);
++ }
+
+ if (screen >= ScreenCount(display))
+ LispDestroy("%s: screen index %d too large, %d screens available",
+@@ -408,24 +408,24 @@
+ /* check &OPTIONAL parameters */
+ if (oborder_width == UNSPEC)
+ border_width = 1;
+- else
++ else {
+ CHECK_INDEX(oborder_width);
+- else
+ border_width = FIXNUM_VALUE(oborder_width);
++ }
+
+ if (oborder == UNSPEC)
+ border = BlackPixel(display, DefaultScreen(display));
+- else
++ else {
+ CHECK_LONGINT(oborder);
+- else
+ border = LONGINT_VALUE(oborder);
++ }
+
+ if (obackground == UNSPEC)
+ background = WhitePixel(display, DefaultScreen(display));
+- else
++ else {
+ CHECK_LONGINT(obackground);
+- else
+ background = LONGINT_VALUE(obackground);
++ }
+
+ return (OPAQUE(
+ XCreateSimpleWindow(display, parent, x, y, width, height,
+@@ -588,10 +588,10 @@
+
+ if (opercent == UNSPEC)
+ percent = 0;
+- else
++ else {
+ CHECK_FIXNUM(opercent);
+- else
+ percent = FIXNUM_VALUE(opercent);
++ }
+
+ if (percent < -100 || percent > 100)
+ LispDestroy("%s: percent value %d out of range -100 to 100",
+Index: xc/programs/xedit/lisp/modules/xaw.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/modules/xaw.c,v
+retrieving revision 1.14
+retrieving revision 1.16
+diff -u -r1.14 -r1.16
+--- xc/programs/xedit/lisp/modules/xaw.c 23 Nov 2002 08:26:52 -0000 1.14
++++ xc/programs/xedit/lisp/modules/xaw.c 27 Apr 2003 18:17:37 -0000 1.16
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/modules/xaw.c,v 1.14 2002/11/23 08:26:52 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/modules/xaw.c,v 1.16 2003/04/27 18:17:37 tsi Exp $ */
+
+ #include <stdlib.h>
+ #include <X11/Intrinsic.h>
+@@ -64,8 +64,8 @@
+ #include <X11/Xaw/Tree.h>
+ #include <X11/Xaw/Viewport.h>
+ #include <X11/Vendor.h>
+-#include "internal.h"
+-#include "private.h"
++#include "lisp/internal.h"
++#include "lisp/private.h"
+
+ /*
+ * Types
+@@ -318,7 +318,6 @@
+ xaw-scrollbar-coerce-to-real opaque
+ */
+ {
+- LispObj *result;
+ float *floatp;
+ double real;
+
+Index: xc/programs/xedit/lisp/modules/xt.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/modules/xt.c,v
+retrieving revision 1.19
+retrieving revision 1.21
+diff -u -r1.19 -r1.21
+--- xc/programs/xedit/lisp/modules/xt.c 23 Nov 2002 08:26:52 -0000 1.19
++++ xc/programs/xedit/lisp/modules/xt.c 27 Apr 2003 18:17:38 -0000 1.21
+@@ -27,7 +27,7 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/modules/xt.c,v 1.19 2002/11/23 08:26:52 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/modules/xt.c,v 1.21 2003/04/27 18:17:38 tsi Exp $ */
+
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -35,8 +35,8 @@
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
+-#include "internal.h"
+-#include "private.h"
++#include "lisp/internal.h"
++#include "lisp/private.h"
+
+ /*
+ * Types
+@@ -67,7 +67,7 @@
+ /*
+ * Prototypes
+ */
+-int xtLoadModule(LispMac*);
++int xtLoadModule(void);
+ void LispXtCleanupCallback(Widget, XtPointer, XtPointer);
+
+ void LispXtCallback(Widget, XtPointer, XtPointer);
+@@ -545,13 +545,13 @@
+ int count;
+
+ CHECK_CONS(fallback_resources);
+- for (string = fallback_resources, count = 0; CONS_P(string);
++ for (string = fallback_resources, count = 0; CONSP(string);
+ string = CDR(string), count++)
+ CHECK_STRING(CAR(string));
+
+ /* fallback resources was correctly specified */
+ fallback = LispMalloc(sizeof(String) * (count + 1));
+- for (string = fallback_resources, count = 0; CONS_P(string);
++ for (string = fallback_resources, count = 0; CONSP(string);
+ string = CDR(string), count++)
+ fallback[count] = THESTR(CAR(string));
+ fallback[count] = NULL;
+@@ -644,8 +644,8 @@
+ }
+
+ if (mask != (mask & XtIMAll))
+- LispDestroy("%s: %d does not fit in XtInputMask %d",
+- STRFUN(builtin), mask);
++ LispDestroy("%s: %ld does not fit in XtInputMask %ld",
++ STRFUN(builtin), (long)mask, (long)XtIMAll);
+
+ if (mask)
+ XtAppProcessEvent(appcon, mask);
+@@ -800,6 +800,8 @@
+ STRFUN(builtin), STROBJ(oparent));
+ parent = (Widget)(oparent->data.opaque.data);
+
++ if (arguments == UNSPEC)
++ arguments = NIL;
+ CHECK_LIST(arguments);
+
+ if (options == SHELL)
+@@ -807,7 +809,7 @@
+ else
+ widget = XtCreateWidget(name, widget_class, parent, NULL, 0);
+
+- if (arguments == UNSPEC || arguments == NIL)
++ if (arguments == NIL)
+ resources = NULL;
+ else {
+ resources = LispConvertResources(arguments, widget,
+@@ -878,7 +880,7 @@
+
+ GCDisable();
+ result = NIL;
+- for (list = arguments; CONS_P(list); list = CDR(list)) {
++ for (list = arguments; CONSP(list); list = CDR(list)) {
+ CHECK_STRING(CAR(list));
+ if ((resource = GetResourceInfo(THESTR(CAR(list)), rlist, plist))
+ == NULL) {
+@@ -928,9 +930,9 @@
+ /* special resources */
+ if (resource->qtype == qString) {
+ #ifdef LONG64
+- object = CONS(CAR(list), STRING(c8));
++ object = CONS(CAR(list), STRING((char*)c8));
+ #else
+- object = CONS(CAR(list), STRING(c4));
++ object = CONS(CAR(list), STRING((char*)c4));
+ #endif
+ }
+ else if (resource->qtype == qCardinal || resource->qtype == qInt) {
+Index: xc/programs/xedit/lisp/mp/mpi.c
+===================================================================
+RCS file: /cvs/xc/programs/xedit/lisp/mp/mpi.c,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- xc/programs/xedit/lisp/mp/mpi.c 20 Nov 2002 07:44:43 -0000 1.12
++++ xc/programs/xedit/lisp/mp/mpi.c 25 Mar 2003 04:18:28 -0000 1.13
+@@ -27,10 +27,14 @@
+ * Author: Paulo C�r Pereira de Andrade
+ */
+
+-/* $XFree86: xc/programs/xedit/lisp/mp/mpi.c,v 1.12 2002/11/20 07:44:43 paulo Exp $ */
++/* $XFree86: xc/programs/xedit/lisp/mp/mpi.c,v 1.13 2003/03/25 04:18:28 dawes Exp $ */
+
+ #include "mp.h"
+
++#ifdef __UNIXOS2__
++# define finite(x) isfinite(x)
++#endif
++
+ /*
+ * Prototypes
+ */
Property changes on: trunk/debian/patches/000_stolen_from_HEAD_xedit.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: