-/* The configuration script links system.h to a s- file that describes
- the system type you are using.
- See the file ../etc/MACHINES for a list of systems and
- the names of the s- files to use for them.
- See s-template.h for documentation on writing s- files. */
-#include "system.h"
-
-/* The configuration script links machine.h to a m- file that
- describes the machine and system you use.
- See the file ../etc/MACHINES for a list of machines and
- the names of the m- files to use for them.
- See m-template.h for info on what m- files should define.
- */
-#include "machine.h"
-
-/* Load in the conversion definitions if this system
- needs them and the source file being compiled has not
- said to inhibit this. There should be no need for you
- to alter these lines. */
-
-#ifdef SHORTNAMES
-#ifndef NO_SHORTNAMES
-#include "../shortnames/remap.h"
-#endif /* not NO_SHORTNAMES */
-#endif /* SHORTNAMES */
-
/* Define HAVE_X_WINDOWS if you want to use the X window system. */
-
/* #define HAVE_X_WINDOWS */
/* Define HAVE_X11 if you want to use version 11 of X windows.
Otherwise, Emacs expects to use version 10. */
-
-#define HAVE_X11
+/* #define HAVE_X11 */
/* Define HAVE_X_MENU if you want to use the X window menu system.
This appears to work on some machines that support X
and not on others. */
-
/* #define HAVE_X_MENU */
-/* Define `subprocesses' should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- These do not work for some USG systems yet;
- for the ones where they work, the s-*.h file defines this flag. */
-
-#ifndef VMS
-#ifndef USG
-#define subprocesses
-#endif
+/* If we're using any sort of window system, define MULTI_SCREEN. */
+#ifdef HAVE_X_WINDOWS
+#define MULTI_SCREEN
#endif
/* Define USER_FULL_NAME to return a string
/* #define AMPERSAND_FULL_NAME */
-/* Maximum screen width we handle. */
-
-#define MScreenWidth 300
-
-/* Maximum screen length we handle. */
-
-#define MScreenLength 300
-
-/* # bytes of pure Lisp code to leave space for.
- Note that s-vms.h, m-sun2.h and m-sparc.h may override this default. */
-
-#ifndef PURESIZE
-#ifdef HAVE_X_WINDOWS
-#define PURESIZE 122000
-#else
-#define PURESIZE 118000
-#endif
-#endif
-
/* Define HIGHPRI as a negative number
if you want Emacs to run at a higher than normal priority.
For this to take effect, you must install Emacs with setuid root.
Emacs will change back to the users's own uid after setting
its priority. */
-
/* #define HIGHPRI */
-/* support `getenv' and `setenv' in Emacs (unix only) */
-#define MAINTAIN_ENVIRONMENT
-
/* Define LISP_FLOAT_TYPE if you want emacs to support floating-point
numbers. */
-
/* #define LISP_FLOAT_TYPE */
/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
-
/* #define GNU_MALLOC */
/* Define REL_ALLOC if you want to use the relocating allocator for
buffer space. */
-
/* #define REL_ALLOC */
+/* Define this macro if you want to use 16-bit GLYPHs. Currently this
+ option isn't terribly useful (the current distribution doesn't
+ support large characters in buffer text), so the configuration
+ script doesn't provide an option to select it.
+
+ A character is displayed on a given terminal by means of a sequence
+ of one or more GLYPHs. A GLYPH is something that takes up exactly
+ one display position on the screen.
+
+ Emacs can use 8-bit or 16-bit values to represent GLYPHs. Under X
+ windows, 16-bit GLYPHs allow you to display characters from fonts
+ too large to be indexed by 8 bits alone, but drawing with 16-bit GLYPHs
+ is usually quite a bit slower than drawing with 8-bit GLYPHs. */
+/* #define GLYPH_16_BIT */
+
+#ifdef GLYPH_16_BIT
+#define GLYPH unsigned short
+#else
+#define GLYPH unsigned char
+#endif
+
+/* The configuration script links system.h to a s- file that describes
+ the system type you are using.
+ See the file ../share-lib/MACHINES for a list of systems and
+ the names of the s- files to use for them.
+ See s-template.h for documentation on writing s- files. */
+#include "@opsystem@"
+
+/* The configuration script links machine.h to a m- file that
+ describes the machine and system you use.
+ See the file ../share-lib/MACHINES for a list of machines and
+ the names of the m- files to use for them.
+ See m-template.h for info on what m- files should define. */
+#include "@machine@"
+
+/* Load in the conversion definitions if this system
+ needs them and the source file being compiled has not
+ said to inhibit this. There should be no need for you
+ to alter these lines. */
+
+#ifdef SHORTNAMES
+#ifndef NO_SHORTNAMES
+#include "../shortnames/remap.h"
+#endif /* not NO_SHORTNAMES */
+#endif /* SHORTNAMES */
+
+/* Define `subprocesses' should be defined if you want to
+ have code for asynchronous subprocesses
+ (as used in M-x compile and M-x shell).
+ These do not work for some USG systems yet;
+ for the ones where they work, the s-*.h file defines this flag. */
+
+#ifndef VMS
+#ifndef USG
+/* #define subprocesses */
+#endif
+#endif
+
/* Define LD_SWITCH_SITE to contain any special flags your loader may
need. For instance, if you've defined HAVE_X_WINDOWS above and your
X libraries aren't in a place that your loader can find on its own,
you might want to add "-L/..." or something similar. */
-
/* #define LD_SWITCH_SITE */
/* Define C_SWITCH_SITE to contain any special flags your compiler may
need. For instance, if you've defined HAVE_X_WINDOWS above and your
X include files aren't in a place that your compiler can find on its
own, you might want to add "-I/..." or something similar. */
-
/* #define C_SWITCH_SITE */
+
+/* Define the return type of signal handlers if the s-xxx file
+ did not already do so. */
+#ifndef SIGTYPE
+#define SIGTYPE void
+#endif