entered into RCS

3 files changed, 30 insertions, 11 deletions

diff --git a/src/buffer.h b/src/buffer.h
index a75d81bfd4a..a0e06025893 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,11 +1,11 @@
 /* Header file for the buffer manipulation primitives.
-   Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -296,6 +296,15 @@ extern struct buffer buffer_local_flags;
 
 extern struct buffer buffer_local_symbols;
 
+/* This structure holds the required types for the values in the
+   buffer-local slots.  If a slot contains Qnil, then the
+   corresponding buffer slot may contain a value of any type.  If a
+   slot contains an integer, then prospective values' tags must be
+   equal to that integer.  When a tag does not match, the function
+   buffer_slot_type_mismatch will signal an error.  The value Qnil may
+   always be safely stored in any slot.  */
+struct buffer buffer_local_types;
+
 /* Point in the current buffer. */
 
 #define point (current_buffer->text.pt + 0)
diff --git a/src/frame.h b/src/frame.h
index 8b46e591a20..1a87e6c618d 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -73,7 +73,7 @@ struct frame
   /* New height and width for pending size change.  0 if no change pending.  */
   int new_height, new_width;
 
-  /* Name of this frame: a Lisp string.  */
+  /* Name of this frame: a Lisp string.  See also `explicit_name'.  */
   Lisp_Object name;
 
   /* The frame which should recieve keystrokes that occur in this
@@ -143,6 +143,12 @@ struct frame
   /* True if frame's root window can't be split.  */
   char no_split;
 
+  /* If this is set, then Emacs won't change the frame name to indicate
+     the current buffer, etcetera.  If the user explicitly sets the frame
+     name, this gets set.  If the user sets the name to Qnil, this is
+     cleared.  */
+  char explicit_name;
+
   /* Storage for messages to this frame. */
   char *message_buf;
 
@@ -285,8 +291,8 @@ extern int message_buf_print;
 #define FRAME_NO_SPLIT_P(f) 0
 #define FRAME_WANTS_MODELINE_P(f) 1
 #define FRAME_ICONIFIED_P(f) 0
-#define FRAME_MINIBUF_WINDOW(f) (minibuf_window)
-#define FRAME_ROOT_WINDOW(f) (XWINDOW (minibuf_window)->prev)
+#define FRAME_MINIBUF_WINDOW(f) (the_only_frame.root_window)
+#define FRAME_ROOT_WINDOW(f) (the_only_frame.root_window)
 #define FRAME_SELECTED_WINDOW(f) (selected_window)
 #define SET_GLYPHS_FRAME(glyphs,frame) do ; while (0)
 #define FRAME_INSERT_COST(frame)  (the_only_frame.insert_line_cost)
diff --git a/src/window.h b/src/window.h
index 8cb36ef0a8d..aa4278623ca 100644
--- a/src/window.h
+++ b/src/window.h
@@ -63,11 +63,12 @@ initially the root window is a leaf window, but if more windows
 are created then that leaf window ceases to be root and a newly
 made combination window becomes root instead.
 
-In any case, prev of the minibuf window is the root window and
-next of the root window is the minibuf window.  To find the
-root window at any time, do XWINDOW (minibuf_window)->prev.
+In any case, on screens which have an ordinary window and a
+minibuffer, prev of the minibuf window is the root window and next of
+the root window is the minibuf window.  On minibufferless screens or
+minibuffer-only screens, the root window and the minibuffer window are
+one and the same, so its prev and next members are nil.  */
 
-*/
 
 struct window
   {
@@ -174,8 +175,7 @@ extern int window_select_count;
 
 /* The minibuffer window of the selected frame.
    Note that you cannot test for minibufferness of an arbitrary window
-   by comparing against this; but you can test for minibufferness of
-   the selected window or of any window that is displayed.  */
+   by comparing against this; use the MINI_WINDOW_P macro instead.  */
 
 extern Lisp_Object minibuf_window;
 
@@ -247,3 +247,7 @@ extern int windows_or_buffers_changed;
 /* Number of windows displaying the selected buffer.
    Normally this is 1, but it can be more.  */
 extern int buffer_shared;
+
+/* If *ROWS or *COLS are too small a size for FRAME, set them to the
+   minimum allowable size.  */
+extern void check_frame_size ( /* FRAME_PTR frame, int *rows, int *cols */ );