2000-03-25 J. Kean Johnston <jkj(a)sco.com>
* lisp.h: Allow s- or m- files to prevent the definition of
intptr_t and related types, for systems whose <sys/types.h>
already defines them.
* redisplay-tty.c: Swap the termcap names for the cursor_invisible
and cursor_visible variables; they were inverted.
* s/sco7.h (HAVE_INTTYPES): Define.
(USG5_5): Define
* m/intel386.h: Dont define away vfork() on SVR5 systems.
--- ./src/m/intel386.h.jkj Sat Mar 25 14:37:14 2000
+++ ./src/m/intel386.h Sat Mar 25 14:41:36 2000
@@ -28,14 +28,17 @@
Intel 386 (-machine=intel386 or -machine=is386.h)
The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
- isc2-2, 386-ix, esix, linux, sco3.2v4, and xenix.
+ isc2-2, 386-ix, esix, linux, sco3.2v4, sco3.2v5, usg5-5 and xenix.
18.58 should support a wide variety of operating systems.
Use isc2-2 for Interactive 386/ix version 2.2.
Use 386ix for prior versions.
Use esix for Esix.
Use linux for Linux.
- It isn't clear what to do on an SCO system.
+ Use sco3.2v4.2 for SCO UNIX.
+ Use sco3.2v5.0 for SCO OpenServer Release 5.
+ Use sysv4.2 for SCO UnixWare 2 and Novel Univel 1.
+ Use sysv5 for SCO UnixWare 7.
-machine=is386 is used for an Integrated Solutions 386 machine.
It may also be correct for Microport systems.
@@ -175,6 +178,10 @@
/* XEmacs change: John Hughes <john(a)AtlanTech.COM> says using vfork
under i386-unknown-sysv4.2 makes C-g sometimes cause a SIGSEGV
in TTY mode; the problem goes away if you use fork */
+/* XEmacs change: J. Kean Johnston <jkj(a)sco.com> says that this is
+ no longer true in System V Release 5 (UnixWare 7). */
#ifdef USG5_4_2
+#ifndef USG5_5
#define vfork fork
+#endif
#endif
--- ./src/s/sco7.h.jkj Sat Mar 25 14:43:34 2000
+++ ./src/s/sco7.h Sat Mar 25 14:46:17 2000
@@ -12,3 +12,10 @@
/* XEmacs change: communicate to m/intel386.h */
#define USG5_4_2
+
+/* XEmacs change: communicate to m/intel386.h */
+#define USG5_5
+
+/* XEmacs change: prevent definition of intptr_t and friends */
+#define HAVE_INTTYPES
+
--- ./src/lisp.h.jkj Sat Mar 25 14:33:13 2000
+++ ./src/lisp.h Sat Mar 25 14:33:45 2000
@@ -1950,6 +1950,7 @@
#define IS_ANY_SEP(c) IS_DIRECTORY_SEP (c)
#endif
+#ifndef HAVE_INTTYPES
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#elif SIZEOF_VOID_P == SIZEOF_INT
@@ -1966,6 +1967,7 @@
typedef long intptr_t;
typedef unsigned long uintptr_t;
#endif
+#endif /* HAVE_INTTYPES */
/* Defined in alloc.c */
void release_breathing_space (void);
--- ./src/redisplay-tty.c.jkj Sat Mar 25 14:55:44 2000
+++ ./src/redisplay-tty.c Wed Mar 22 20:47:10 2000
@@ -1239,8 +1239,8 @@
TTY_SD (c).audio_bell = "\07";
}
- TTY_SD (c).cursor_visible = tgetstr ("ve", &bufptr);
- TTY_SD (c).cursor_normal = tgetstr ("vs", &bufptr);
+ TTY_SD (c).cursor_visible = tgetstr ("vs", &bufptr);
+ TTY_SD (c).cursor_normal = tgetstr ("ve", &bufptr);
TTY_SD (c).init_motion = tgetstr ("ti", &bufptr);
TTY_SD (c).end_motion = tgetstr ("te", &bufptr);
TTY_SD (c).keypad_on = tgetstr ("ks", &bufptr);
--- ./lisp/about.el.jkj Sat Mar 25 14:13:25 2000
+++ ./lisp/about.el Sat Mar 25 14:29:05 2000
@@ -1266,6 +1266,12 @@
has much time for playing with cool programs. What little time he has
now goes to XEmacs hacking, where he's worked on speeding up dired under
MS Windows, and to feeding his two cats.\n")
+ (print-short "J. Kean Johnston" "jkj(a)sco.com" "\
+Emacs hacker since 18.whatever, who saw the light and decided to work
+on XEmacs instead. General nuisance and maintainer of SCO ports, and
+the author and maintainer of the dynamic modules code. He dreams of
+moving large portions of the Lisp code into compiled C code and loading
+it on demand. He is proud to work for a commercial UNIX company :-)\n")
"\n\
In addition to those just mentioned, the following people have spent a
great deal of effort providing feedback, testing beta versions of
@@ -1376,7 +1382,6 @@
(print-short "Markku Jarvinen" "Markku.Jarvinen(a)simpukka.funet.fi")
(print-short "Robin Jeffries" "robin.jeffries(a)sun.com")
(print-short "Philip Johnson" "johnson(a)uhics.ics.Hawaii.Edu")
- (print-short "J. Kean Johnston" "jkj(a)paradigm-sa.com")
(print-short "John W. Jones" "jj(a)asu.edu")
(print-short "Andreas Kaempf" "andreas(a)sccon.com")
(print-short "Yoshiaki Kasahara" "kasahara(a)nc.kyushu-u.ac.jp")