Commit 1cbd5d9d authored by Jim Blandy's avatar Jim Blandy
Browse files

*** empty log message ***

parent 109d300c
/* GNU Emacs site configuration template file. /* GNU Emacs site configuration template file. -*- C -*-
Copyright (C) 1988 Free Software Foundation, Inc. Copyright (C) 1988 Free Software Foundation, Inc.
This file is part of GNU Emacs. This file is part of GNU Emacs.
...@@ -32,9 +32,9 @@ and this notice must be preserved on all copies. */ ...@@ -32,9 +32,9 @@ and this notice must be preserved on all copies. */
and not on others. */ and not on others. */
/* #define HAVE_X_MENU */ /* #define HAVE_X_MENU */
/* If we're using any sort of window system, define MULTI_SCREEN. */ /* If we're using any sort of window system, define MULTI_FRAME. */
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
#define MULTI_SCREEN #define MULTI_FRAME
#endif #endif
/* Define USER_FULL_NAME to return a string /* Define USER_FULL_NAME to return a string
...@@ -79,7 +79,7 @@ and this notice must be preserved on all copies. */ ...@@ -79,7 +79,7 @@ and this notice must be preserved on all copies. */
A character is displayed on a given terminal by means of a sequence 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 of one or more GLYPHs. A GLYPH is something that takes up exactly
one display position on the screen. one display position on the frame.
Emacs can use 8-bit or 16-bit values to represent GLYPHs. Under X 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 windows, 16-bit GLYPHs allow you to display characters from fonts
...@@ -93,18 +93,20 @@ and this notice must be preserved on all copies. */ ...@@ -93,18 +93,20 @@ and this notice must be preserved on all copies. */
#define GLYPH unsigned char #define GLYPH unsigned char
#endif #endif
/* The configuration script links system.h to a s- file that describes /* The configuration script replaces the string @opsystem@ with the
the system type you are using. name of the s/*.h file that describes the system type you are
See the file ../etc/MACHINES for a list of systems and using; an option of the form "-opsystem=OPSYS" says to use
the names of the s- files to use for them. "s/OPSYS.h". See the file ../etc/MACHINES for a list of systems
See s-template.h for documentation on writing s- files. */ and the -opsystem flags to use for them.
See s/template.h for documentation on writing s/*.h files. */
#include "@opsystem@" #include "@opsystem@"
/* The configuration script links machine.h to a m- file that /* The configuration script replaces the string @machine@ with the
describes the machine and system you use. name of the m/*.h file that describes the machine you are
See the file ../etc/MACHINES for a list of machines and using; an option of the form "-machine=MACH" says to use
the names of the m- files to use for them. "m/MACH.h". See the file ../etc/MACHINES for a list of machines
See m-template.h for info on what m- files should define. */ and the -machine flags to use for them.
See m/template.h for documentation on writing m/*.h files. */
#include "@machine@" #include "@machine@"
/* Some s- files may define SYSTEM_MALLOC, in which case make sure /* Some s- files may define SYSTEM_MALLOC, in which case make sure
...@@ -134,7 +136,7 @@ and this notice must be preserved on all copies. */ ...@@ -134,7 +136,7 @@ and this notice must be preserved on all copies. */
have code for asynchronous subprocesses have code for asynchronous subprocesses
(as used in M-x compile and M-x shell). (as used in M-x compile and M-x shell).
These do not work for some USG systems yet; These do not work for some USG systems yet;
for the ones where they work, the s-*.h file defines this flag. */ for the ones where they work, the s/*.h file defines this flag. */
#ifndef VMS #ifndef VMS
#ifndef USG #ifndef USG
......
...@@ -425,7 +425,7 @@ main (argc, argv, envp) ...@@ -425,7 +425,7 @@ main (argc, argv, envp)
if (!noninteractive) if (!noninteractive)
{ {
#ifdef VMS #ifdef VMS
init_vms_input ();/* init_display calls get_screen_size, that needs this */ init_vms_input ();/* init_display calls get_frame_size, that needs this */
#endif /* VMS */ #endif /* VMS */
init_display (); /* Determine terminal type. init_sys_modes uses results */ init_display (); /* Determine terminal type. init_sys_modes uses results */
} }
...@@ -494,8 +494,8 @@ main (argc, argv, envp) ...@@ -494,8 +494,8 @@ main (argc, argv, envp)
syms_of_mocklisp (); syms_of_mocklisp ();
syms_of_process (); syms_of_process ();
syms_of_search (); syms_of_search ();
#ifdef MULTI_SCREEN #ifdef MULTI_FRAME
syms_of_screen (); syms_of_frame ();
#endif #endif
syms_of_syntax (); syms_of_syntax ();
syms_of_undo (); syms_of_undo ();
......
...@@ -28,10 +28,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -28,10 +28,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "lisp.h" #include "lisp.h"
#include "commands.h" #include "commands.h"
#ifdef MULTI_SCREEN
#include "screen.h"
#endif
#include "buffer.h" #include "buffer.h"
Lisp_Object Qstring_lessp; Lisp_Object Qstring_lessp;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment