diff options
| -rw-r--r-- | src/config.in | 32 | ||||
| -rw-r--r-- | src/emacs.c | 6 | ||||
| -rw-r--r-- | src/fns.c | 4 |
3 files changed, 20 insertions, 22 deletions
diff --git a/src/config.in b/src/config.in index b9b6e19c1db..1a0a063bafa 100644 --- a/src/config.in +++ b/src/config.in @@ -1,4 +1,4 @@ -/* GNU Emacs site configuration template file. +/* GNU Emacs site configuration template file. -*- C -*- Copyright (C) 1988 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -32,9 +32,9 @@ and this notice must be preserved on all copies. */ and not on others. */ /* #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 -#define MULTI_SCREEN +#define MULTI_FRAME #endif /* Define USER_FULL_NAME to return a string @@ -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 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 windows, 16-bit GLYPHs allow you to display characters from fonts @@ -93,18 +93,20 @@ and this notice must be preserved on all copies. */ #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 ../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. */ +/* The configuration script replaces the string @opsystem@ with the + name of the s/*.h file that describes the system type you are + using; an option of the form "-opsystem=OPSYS" says to use + "s/OPSYS.h". See the file ../etc/MACHINES for a list of systems + and the -opsystem flags to use for them. + See s/template.h for documentation on writing s/*.h files. */ #include "@opsystem@" -/* 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. */ +/* The configuration script replaces the string @machine@ with the + name of the m/*.h file that describes the machine you are + using; an option of the form "-machine=MACH" says to use + "m/MACH.h". See the file ../etc/MACHINES for a list of machines + and the -machine flags to use for them. + See m/template.h for documentation on writing m/*.h files. */ #include "@machine@" /* 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. */ 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. */ + for the ones where they work, the s/*.h file defines this flag. */ #ifndef VMS #ifndef USG diff --git a/src/emacs.c b/src/emacs.c index df698ee8309..54a39fb4d0a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -425,7 +425,7 @@ main (argc, argv, envp) if (!noninteractive) { #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 */ init_display (); /* Determine terminal type. init_sys_modes uses results */ } @@ -494,8 +494,8 @@ main (argc, argv, envp) syms_of_mocklisp (); syms_of_process (); syms_of_search (); -#ifdef MULTI_SCREEN - syms_of_screen (); +#ifdef MULTI_FRAME + syms_of_frame (); #endif syms_of_syntax (); syms_of_undo (); diff --git a/src/fns.c b/src/fns.c index 90b2c0371b0..cf8ac7b9e2b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -28,10 +28,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "lisp.h" #include "commands.h" -#ifdef MULTI_SCREEN -#include "screen.h" -#endif - #include "buffer.h" Lisp_Object Qstring_lessp; |