*** empty log message ***

src/lisp.h

@@ -86,9 +86,9 @@ enum Lisp_Type
        XOBJFWD(obj) points to the Lisp_Object variable. */
     Lisp_Objfwd,
 
-    /* Pointer to a vector-like object describing a display screen
+    /* Pointer to a vector-like object describing a display frame
        on which Emacs can display a window hierarchy.  */
-    Lisp_Screen,
+    Lisp_Frame,
 
     /* Used when a FILE * value needs to be passed
        in an argument of type Lisp_Object.
@@ -840,7 +840,7 @@ extern Lisp_Object Qcdr;
 extern Lisp_Object Qfloatp, Qinteger_or_floatp, Qinteger_or_float_or_marker_p;
 #endif /* LISP_FLOAT_TYPE */
 
-extern Lisp_Object Qscreenp;
+extern Lisp_Object Qframep;
 
 extern Lisp_Object Feq (), Fnull (), Flistp (), Fconsp (), Fatom (), Fnlistp ();
 extern Lisp_Object Fintegerp (), Fnatnump (), Fsymbolp ();
@@ -1040,35 +1040,35 @@ extern Lisp_Object Fset_window_configuration (), Fcurrent_window_configuration (
 extern Lisp_Object Fcoordinates_in_window_p ();
 extern Lisp_Object Fwindow_at ();
 
-/* defined in screen.c */
-extern Lisp_Object Fscreenp ();
-extern Lisp_Object Fselect_screen ();
-extern Lisp_Object Ffocus_screen ();
-extern Lisp_Object Funfocus_screen ();
-extern Lisp_Object Fselected_screen ();
-extern Lisp_Object Fwindow_screen ();
-extern Lisp_Object Fscreen_root_window ();
-extern Lisp_Object Fscreen_selected_window ();
-extern Lisp_Object Fscreen_list ();
-extern Lisp_Object Fnext_screen ();
-extern Lisp_Object Fdelete_screen ();
+/* defined in frame.c */
+extern Lisp_Object Fframep ();
+extern Lisp_Object Fselect_frame ();
+extern Lisp_Object Ffocus_frame ();
+extern Lisp_Object Funfocus_frame ();
+extern Lisp_Object Fselected_frame ();
+extern Lisp_Object Fwindow_frame ();
+extern Lisp_Object Fframe_root_window ();
+extern Lisp_Object Fframe_selected_window ();
+extern Lisp_Object Fframe_list ();
+extern Lisp_Object Fnext_frame ();
+extern Lisp_Object Fdelete_frame ();
 extern Lisp_Object Fread_mouse_position ();
 extern Lisp_Object Fset_mouse_position ();
-extern Lisp_Object Fmake_screen_visible ();
-extern Lisp_Object Fmake_screen_invisible ();
-extern Lisp_Object Ficonify_screen ();
-extern Lisp_Object Fdeiconify_screen ();
-extern Lisp_Object Fscreen_visible_p ();
-extern Lisp_Object Fvisible_screen_list ();
-extern Lisp_Object Fscreen_parameters ();
-extern Lisp_Object Fmodify_screen_parameters ();
-extern Lisp_Object Fscreen_pixel_size ();
-extern Lisp_Object Fscreen_height ();
-extern Lisp_Object Fscreen_width ();
-extern Lisp_Object Fset_screen_height ();
-extern Lisp_Object Fset_screen_width ();
-extern Lisp_Object Fset_screen_size ();
-extern Lisp_Object Fset_screen_position ();
+extern Lisp_Object Fmake_frame_visible ();
+extern Lisp_Object Fmake_frame_invisible ();
+extern Lisp_Object Ficonify_frame ();
+extern Lisp_Object Fdeiconify_frame ();
+extern Lisp_Object Fframe_visible_p ();
+extern Lisp_Object Fvisible_frame_list ();
+extern Lisp_Object Fframe_parameters ();
+extern Lisp_Object Fmodify_frame_parameters ();
+extern Lisp_Object Fframe_pixel_size ();
+extern Lisp_Object Fframe_height ();
+extern Lisp_Object Fframe_width ();
+extern Lisp_Object Fset_frame_height ();
+extern Lisp_Object Fset_frame_width ();
+extern Lisp_Object Fset_frame_size ();
+extern Lisp_Object Fset_frame_position ();
 #ifndef HAVE_X11
 extern Lisp_Object Frubber_band_rectangle ();
 #endif	/* HAVE_X11 */

src/minibuf.c

@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "commands.h"
 #include "buffer.h"
 #include "dispextern.h"
-#include "screen.h"
+#include "frame.h"
 #include "window.h"
 #include "syntax.h"
 
@@ -91,7 +91,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag)
 {
   register Lisp_Object val;
   int count = specpdl_ptr - specpdl;
-  Lisp_Object mini_screen = WINDOW_SCREEN (XWINDOW (minibuf_window));
+  Lisp_Object mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
   struct gcpro gcpro1, gcpro2;
 
   if (XTYPE (prompt) != Lisp_String)
@@ -105,7 +105,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag)
       && minibuf_level > 0
       && (EQ (selected_window, minibuf_window)))
 #if 0
-	  || selected_screen != XSCREEN (WINDOW_SCREEN (XWINDOW (minibuf_window)))
+	  || selected_frame != XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)))
 #endif
     error ("Command attempted to use minibuffer while in minibuffer");
 
@@ -127,12 +127,12 @@ read_minibuf (map, initial, prompt, backup_n, expflag)
   record_unwind_protect (Fset_window_configuration,
 			 Fcurrent_window_configuration (Qnil));
 
-  /* If the minibuffer window is on a different screen, save that
-     screen's configuration too.  */
-  if (XSCREEN (mini_screen) != selected_screen)
+  /* If the minibuffer window is on a different frame, save that
+     frame's configuration too.  */
+  if (XFRAME (mini_frame) != selected_frame)
     {
       record_unwind_protect (Fset_window_configuration,
-			     Fcurrent_window_configuration (mini_screen));
+			     Fcurrent_window_configuration (mini_frame));
     }
 
   val = current_buffer->directory;
@@ -141,17 +141,17 @@ read_minibuf (map, initial, prompt, backup_n, expflag)
   Fmake_local_variable (Qprint_escape_newlines);
   print_escape_newlines = 1;
 
-#ifdef MULTI_SCREEN
-  /* If the minibuffer window is on another screen, shift this screen's
+#ifdef MULTI_FRAME
+  /* If the minibuffer window is on another frame, shift this frame's
      focus to that window, and arrange to put it back later.  */
-  if (XSCREEN (WINDOW_SCREEN (XWINDOW (minibuf_window)))
-      != selected_screen)
+  if (XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)))
+      != selected_frame)
     {
       record_unwind_protect (read_minibuf_unwind,
-			     Fcons (Fselected_screen (),
-				    SCREEN_FOCUS_SCREEN (selected_screen)));
+			     Fcons (Fselected_frame (),
+				    FRAME_FOCUS_FRAME (selected_frame)));
 
-      Fredirect_screen_focus (Fselected_screen (), mini_screen);
+      Fredirect_frame_focus (Fselected_frame (), mini_frame);
     }
   else
     record_unwind_protect (read_minibuf_unwind, Qnil);
@@ -186,18 +186,18 @@ read_minibuf (map, initial, prompt, backup_n, expflag)
 
   /* If cursor is on the minibuffer line,
      show the user we have exited by putting it in column 0.  */
-  if ((SCREEN_CURSOR_Y (selected_screen)
+  if ((FRAME_CURSOR_Y (selected_frame)
        >= XFASTINT (XWINDOW (minibuf_window)->top))
       && !noninteractive)
     {
-      SCREEN_CURSOR_X (selected_screen) = 0;
-      update_screen (selected_screen, 1, 1);
+      FRAME_CURSOR_X (selected_frame) = 0;
+      update_frame (selected_frame, 1, 1);
     }
 
   /* Make minibuffer contents into a string */
   val = make_buffer_string (1, Z);
   bcopy (GAP_END_ADDR, XSTRING (val)->data + GPT - BEG, Z - GPT);
-  unbind_to (count, Qnil);	/* The appropriate screen will get selected
+  unbind_to (count, Qnil);	/* The appropriate frame will get selected
 				   in set-window-configuration.  */
 
   UNGCPRO;
@@ -271,10 +271,10 @@ read_minibuf_unwind (data)
   Vhelp_form = minibuf_save_vector[minibuf_level].help_form;
   Vcurrent_prefix_arg = minibuf_save_vector[minibuf_level].current_prefix_arg;
 
-#ifdef MULTI_SCREEN
-  /* Redirect the focus of the screen that called the minibuffer.  */
+#ifdef MULTI_FRAME
+  /* Redirect the focus of the frame that called the minibuffer.  */
   if (CONSP (data))
-    Fredirect_screen_focus (XCONS (data)->car, XCONS (data)->cdr);
+    Fredirect_frame_focus (XCONS (data)->car, XCONS (data)->cdr);
 #endif
 }
 

src/process.c

@@ -1723,11 +1723,11 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
       if (! XINT (read_kbd))
 	FD_CLR (0, &Available);
 
-      /* If screen size has changed or the window is newly mapped,
+      /* If frame size has changed or the window is newly mapped,
 	 redisplay now, before we start to wait.  There is a race
 	 condition here; if a SIGIO arrives between now and the select
-	 and indicates that a screen is trashed, we lose.  */
-      if (screen_garbaged)
+	 and indicates that a frame is trashed, we lose.  */
+      if (frame_garbaged)
 	redisplay_preserve_echo_area ();
 
       if (XINT (read_kbd) && detect_input_pending ())
@@ -2898,7 +2898,7 @@ effect when `start-process' is called.");
 #include "systime.h"
 #include "termopts.h"
 
-extern int screen_garbaged;
+extern int frame_garbaged;
 
 
 /* As described above, except assuming that there are no subprocesses:
@@ -2981,9 +2981,9 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
       if (XINT (read_kbd) < 0)
 	set_waiting_for_input (&timeout);
 
-      /* If a screen has been newly mapped and needs updating,
+      /* If a frame has been newly mapped and needs updating,
 	 reprocess its display stuff.  */
-      if (screen_garbaged)
+      if (frame_garbaged)
 	redisplay_preserve_echo_area ();
 
       if (XINT (read_kbd) && detect_input_pending ())