Commit e3678b64 authored by Karl Heuer's avatar Karl Heuer

Removed support for !MULTI_FRAME.

parent 8c09486a
......@@ -572,12 +572,6 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
#define FLOAT_SUPPORT
#endif
#ifdef MULTI_FRAME
#define FRAME_SUPPORT ${lispsource}frame.elc
#else
#define FRAME_SUPPORT
#endif
#ifdef HAVE_MOUSE
#define MOUSE_SUPPORT ${lispsource}menu-bar.elc ${lispsource}mouse.elc \
${lispsource}select.elc ${lispsource}scroll-bar.elc
......@@ -631,7 +625,7 @@ lisp= \
FACE_SUPPORT \
MOUSE_SUPPORT \
FLOAT_SUPPORT \
FRAME_SUPPORT \
${lispsource}frame.elc\
X_WINDOWS_SUPPORT \
${lispsource}help.elc \
${lispsource}indent.elc \
......
......@@ -1802,7 +1802,6 @@ mark_object (argptr)
objptr = (Lisp_Object *) &ptr1->contents[COMPILED_CONSTANTS];
goto loop;
}
#ifdef MULTI_FRAME
else if (GC_FRAMEP (obj))
{
/* See comment above under Lisp_Vector for why this is volatile. */
......@@ -1826,7 +1825,6 @@ mark_object (argptr)
mark_object (&ptr->menu_bar_vector);
mark_object (&ptr->buffer_predicate);
}
#endif /* MULTI_FRAME */
else if (GC_BOOL_VECTOR_P (obj))
{
register struct Lisp_Vector *ptr = XVECTOR (obj);
......
......@@ -853,7 +853,6 @@ If BUFFER is omitted or nil, some interesting buffer is returned.")
continue;
if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
continue;
#ifdef MULTI_FRAME
/* If the selected frame has a buffer_predicate,
disregard buffers that don't fit the predicate. */
tem = frame_buffer_predicate ();
......@@ -863,7 +862,6 @@ If BUFFER is omitted or nil, some interesting buffer is returned.")
if (NILP (tem))
continue;
}
#endif
if (NILP (visible_ok))
tem = Fget_buffer_window (buf, Qt);
......
......@@ -225,11 +225,8 @@ for example, (type-of 1) returns `integer'.")
return Qchar_table;
if (GC_BOOL_VECTOR_P (object))
return Qbool_vector;
#ifdef MULTI_FRAME
if (GC_FRAMEP (object))
return Qframe;
#endif
return Qvector;
#ifdef LISP_FLOAT_TYPE
......
......@@ -99,9 +99,7 @@ typedef int FACE;
struct frame_glyphs
{
#ifdef MULTI_FRAME
struct frame *frame; /* Frame these glyphs belong to. */
#endif /* MULTI_FRAME */
int height;
int width;
......
......@@ -144,18 +144,6 @@ FRAME_PTR selected_frame;
the address of the_only_frame. */
FRAME_PTR last_nonminibuf_frame;
/* In a single-frame version, the information that would otherwise
exist inside frame objects lives in the following structure instead.
NOTE: the_only_frame is not checked for garbage collection; don't
store collectible objects in any of its fields!
You're not/The only frame in town/... */
#ifndef MULTI_FRAME
struct frame the_only_frame;
#endif
/* This is a vector, made larger whenever it isn't large enough,
which is used inside `update_frame' to hold the old contents
of the FRAME_PHYS_LINES of the frame being updated. */
......@@ -169,8 +157,6 @@ struct cm Wcm; /* Structure for info on cursor positioning */
int delayed_size_change; /* 1 means SIGWINCH happened when not safe. */
#ifdef MULTI_FRAME
DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
"Clear frame FRAME and output again what is supposed to appear on it.")
(frame)
......@@ -203,30 +189,6 @@ redraw_frame (f)
Fredraw_frame (frame);
}
#else
DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
/* Don't confuse make-docfile by having two doc strings for this function.
make-docfile does not pay attention to #if, for good reason! */
0)
(frame)
Lisp_Object frame;
{
update_begin (0);
set_terminal_modes ();
clear_frame ();
update_end (0);
fflush (stdout);
clear_frame_records (0);
windows_or_buffers_changed++;
/* Mark all windows as INaccurate,
so that every window will have its redisplay done. */
mark_window_display_accurate (FRAME_ROOT_WINDOW (0), 0);
return Qnil;
}
#endif
DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "",
"Clear and redisplay all visible frames.")
()
......@@ -2589,9 +2551,7 @@ For types not defined in VMS, use define emacs_term \"TYPE\".\n\
syms_of_display ()
{
#ifdef MULTI_FRAME
defsubr (&Sredraw_frame);
#endif
defsubr (&Sredraw_display);
defsubr (&Sframe_or_buffer_changed_p);
defsubr (&Sopen_termscript);
......
This diff is collapsed.
......@@ -30,12 +30,7 @@ extern int frame_garbaged;
extern int message_buf_print;
/* The structure representing a frame.
We declare this even if MULTI_FRAME is not defined, because when
we lack multi-frame support, we use one instance of this structure
to represent the one frame we support. This is cleaner than
having miscellaneous random variables scattered about. */
/* The structure representing a frame. */
enum output_method
{ output_termcap, output_x_window, output_msdos_raw, output_win32 };
......@@ -294,14 +289,12 @@ struct frame
char mouse_moved;
};
#ifdef MULTI_KBOARD /* Note that MULTI_KBOARD implies MULTI_FRAME */
#ifdef MULTI_KBOARD
#define FRAME_KBOARD(f) ((f)->kboard)
#else
#define FRAME_KBOARD(f) (&the_only_kboard)
#endif
#ifdef MULTI_FRAME
typedef struct frame *FRAME_PTR;
#define XFRAME(p) ((struct frame *) XPNTR (p))
......@@ -422,8 +415,9 @@ typedef struct frame *FRAME_PTR;
should be a Lisp_Object too; it is used to iterate through the
Vframe_list.
If MULTI_FRAME isn't defined, then this loop expands to something which
executes the statement once. */
This macro is a holdover from a time when multiple frames weren't always
supported. An alternate definition of the macro would expand to
something which executes the statement once. */
#define FOR_EACH_FRAME(list_var, frame_var) \
for ((list_var) = Vframe_list; \
(CONSP (list_var) \
......@@ -446,105 +440,7 @@ extern Lisp_Object Vdefault_frame_alist;
extern Lisp_Object Vterminal_frame;
#else /* not MULTI_FRAME */
/* These definitions are used in a single-frame version of Emacs. */
/* A frame we use to store all the data concerning the screen when we
don't have multiple frames. Remember, if you store any data in it
which needs to be protected from GC, you should staticpro that
element explicitly. */
extern struct frame the_only_frame;
typedef struct frame *FRAME_PTR;
#ifdef __GNUC__
/* A function call for always getting 0 is overkill, so... */
#define WINDOW_FRAME(w) ({ Lisp_Object tem; XSETFASTINT (tem, 0); tem; })
#else
#define WINDOW_FRAME(w) (Fselected_frame ())
#endif
#define XSETFRAME(p, v) (p = WINDOW_FRAME (***bogus***))
#define XFRAME(frame) (&the_only_frame)
extern FRAME_PTR selected_frame;
extern FRAME_PTR last_nonminibuf_frame;
#define FRAME_LIVE_P(f) 1
#define FRAME_MSDOS_P(f) 0
#ifdef MSDOS
/* The following definitions could also be used in the non-MSDOS case,
but the constants below lead to better code. */
#define FRAME_TERMCAP_P(f) (the_only_frame.output_method == output_termcap)
#define FRAME_X_P(f) (the_only_frame.output_method != output_termcap)
#else
#define FRAME_TERMCAP_P(f) 1
#define FRAME_X_P(f) 0
#endif
#define FRAME_WINDOW_P(f) FRAME_X_P (f)
#define FRAME_MINIBUF_ONLY_P(f) 0
#define FRAME_HAS_MINIBUF_P(f) 1
#define FRAME_CURRENT_GLYPHS(f) (the_only_frame.current_glyphs)
#define FRAME_DESIRED_GLYPHS(f) (the_only_frame.desired_glyphs)
#define FRAME_TEMP_GLYPHS(f) (the_only_frame.temp_glyphs)
#define FRAME_HEIGHT(f) (the_only_frame.height)
#define FRAME_WIDTH(f) (the_only_frame.width)
#define FRAME_NEW_HEIGHT(f) (the_only_frame.new_height)
#define FRAME_NEW_WIDTH(f) (the_only_frame.new_width)
#define FRAME_MENU_BAR_LINES(f) (the_only_frame.menu_bar_lines)
#define FRAME_CURSOR_X(f) (the_only_frame.cursor_x)
#define FRAME_CURSOR_Y(f) (the_only_frame.cursor_y)
#define FRAME_SET_VISIBLE(f,p) (p)
#define FRAME_VISIBLE_P(f) 1
#define SET_FRAME_GARBAGED(f) (frame_garbaged = 1)
#define FRAME_GARBAGED_P(f) (frame_garbaged)
#define FRAME_NO_SPLIT_P(f) 0
#define FRAME_WANTS_MODELINE_P(f) 1
#define FRAME_ICONIFIED_P(f) 0
#define FRAME_WINDOW_SIZES_CHANGED(f) the_only_frame.window_sizes_changed
#define FRAME_MINIBUF_WINDOW(f) (minibuf_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)
#define FRAME_DELETE_COST(frame) (the_only_frame.delete_line_cost)
#define FRAME_INSERTN_COST(frame) (the_only_frame.insert_n_lines_cost)
#define FRAME_DELETEN_COST(frame) (the_only_frame.delete_n_lines_cost)
#define FRAME_MESSAGE_BUF(f) (the_only_frame.message_buf)
#define FRAME_SCROLL_BOTTOM_VPOS(f) (the_only_frame.scroll_bottom_vpos)
#define FRAME_FOCUS_FRAME(f) (Qnil)
#define FRAME_CAN_HAVE_SCROLL_BARS(f) (the_only_frame.can_have_scroll_bars)
#define FRAME_HAS_VERTICAL_SCROLL_BARS(f) \
(the_only_frame.has_vertical_scroll_bars)
#define FRAME_SCROLL_BAR_PIXEL_WIDTH(f) (the_only_frame.scroll_bar_pixel_width)
#define FRAME_SCROLL_BAR_COLS(f) (the_only_frame.scroll_bar_cols)
#define FRAME_SCROLL_BARS(f) (the_only_frame.scroll_bars)
#define FRAME_CONDEMNED_SCROLL_BARS(f) (the_only_frame.condemned_scroll_bars)
#define FRAME_MENU_BAR_ITEMS(f) (the_only_frame.menu_bar_items)
#define FRAME_COST_BAUD_RATE(f) (the_only_frame.cost_calculation_baud_rate)
/* See comments in definition above. */
#define FRAME_SAMPLE_VISIBILITY(f) (0)
#define CHECK_FRAME(x, i) do; while (0)
#define CHECK_LIVE_FRAME(x, y) do; while (0)
/* FOR_EACH_FRAME (LIST_VAR, FRAME_VAR) followed by a statement is a
`for' loop which iterates over the elements of Vframe_list. The
loop will set FRAME_VAR, a Lisp_Object, to each frame in
Vframe_list in succession and execute the statement. LIST_VAR
should be a Lisp_Object too; it is used to iterate through the
Vframe_list.
If MULTI_FRAME _is_ defined, then this loop expands to a real
`for' loop which traverses Vframe_list using LIST_VAR and
FRAME_VAR. */
#define FOR_EACH_FRAME(list_var, frame_var) \
for (list_var = Qt; frame_var = WINDOW_FRAME (***bogus***), ! NILP (list_var); list_var = Qnil)
#endif /* not MULTI_FRAME */
/* Device- and MULTI_FRAME-independent scroll bar stuff. */
/* Device-independent scroll bar stuff. */
/* Return the starting column (zero-based) of the vertical scroll bar
for window W. The column before this one is the last column we can
......
......@@ -293,14 +293,12 @@ int last_point_position;
/* The buffer that was current when the last command was started. */
Lisp_Object last_point_position_buffer;
#ifdef MULTI_FRAME
/* The frame in which the last input event occurred, or Qmacro if the
last event came from a macro. We use this to determine when to
generate switch-frame events. This may be cleared by functions
like Fselect_frame, to make sure that a switch-frame event is
generated by the next character. */
Lisp_Object internal_last_event_frame;
#endif
/* A user-visible version of the above, intended to allow users to
figure out where the last event came from, if the event doesn't
......@@ -1154,7 +1152,6 @@ command_loop_1 ()
#endif /* C_ALLOCA */
#if 0
#ifdef MULTI_FRAME
/* Select the frame that the last event came from. Usually,
switch-frame events will take care of this, but if some lisp
code swallows a switch-frame event, we'll fix things up here.
......@@ -1162,7 +1159,6 @@ command_loop_1 ()
if (FRAMEP (internal_last_event_frame)
&& XFRAME (internal_last_event_frame) != selected_frame)
Fselect_frame (internal_last_event_frame, Qnil);
#endif
#endif
/* If it has changed current-menubar from previous value,
really recompute the menubar from the value. */
......@@ -1723,7 +1719,6 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
if (!NILP (Vexecuting_macro))
{
#ifdef MULTI_FRAME
/* We set this to Qmacro; since that's not a frame, nobody will
try to switch frames on us, and the selected window will
remain unchanged.
......@@ -1735,7 +1730,6 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
events read from a macro should never cause a new frame to be
selected. */
Vlast_event_frame = internal_last_event_frame = Qmacro;
#endif
/* Exit the macro if we are at the end.
Also, some things replace the macro with t
......@@ -1810,10 +1804,8 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
if (_setjmp (local_getcjmp))
{
XSETINT (c, quit_char);
#ifdef MULTI_FRAME
XSETFRAME (internal_last_event_frame, selected_frame);
Vlast_event_frame = internal_last_event_frame;
#endif
/* If we report the quit char as an event,
don't do so more than once. */
if (!NILP (Vinhibit_quit))
......@@ -1960,12 +1952,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
if (NILP (current_kboard->kbd_queue))
current_kboard->kbd_queue_has_data = 0;
input_pending = readable_events (0);
#ifdef MULTI_FRAME
if (EVENT_HAS_PARAMETERS (c)
&& EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qswitch_frame))
internal_last_event_frame = XCONS (XCONS (c)->cdr)->car;
Vlast_event_frame = internal_last_event_frame;
#endif
}
}
......@@ -2475,7 +2465,6 @@ kbd_buffer_store_event (event)
}
#endif
#ifdef MULTI_FRAME
/* If this results in a quit_char being returned to Emacs as
input, set Vlast_event_frame properly. If this doesn't
get returned to Emacs as an event, the next event read
......@@ -2489,7 +2478,6 @@ kbd_buffer_store_event (event)
internal_last_event_frame = focus;
Vlast_event_frame = focus;
}
#endif
last_event_timestamp = event->timestamp;
interrupt_signal ();
......@@ -2724,7 +2712,6 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
time, and leave the event in the queue for next time. */
else
{
#ifdef MULTI_FRAME
Lisp_Object frame;
Lisp_Object focus;
......@@ -2742,7 +2729,6 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
&& XFRAME (frame) != selected_frame)
obj = make_lispy_switch_frame (frame);
internal_last_event_frame = frame;
#endif /* MULTI_FRAME */
/* If we didn't decide to make a switch-frame event, go ahead
and build a real event from the queue entry. */
......@@ -2789,7 +2775,6 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
obj = Qnil;
#ifdef MULTI_FRAME
/* Decide if we should generate a switch-frame event. Don't
generate switch-frame events for motion outside of all Emacs
frames. */
......@@ -2806,7 +2791,6 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
obj = make_lispy_switch_frame (frame);
internal_last_event_frame = frame;
}
#endif
/* If we didn't decide to make a switch-frame event, go ahead and
return a mouse-motion event. */
......@@ -2821,9 +2805,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
input_pending = readable_events (0);
#ifdef MULTI_FRAME
Vlast_event_frame = internal_last_event_frame;
#endif
return (obj);
}
......@@ -3998,7 +3980,6 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
Lisp_Object x, y;
unsigned long time;
{
#ifdef MULTI_FRAME
/* Is it a scroll bar movement? */
if (frame && ! NILP (bar_window))
{
......@@ -4017,18 +3998,13 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
/* Or is it an ordinary mouse movement? */
else
#endif /* MULTI_FRAME */
{
int area;
Lisp_Object window;
Lisp_Object posn;
int column, row;
#ifdef MULTI_FRAME
if (frame)
#else
if (1)
#endif
{
/* It's in a frame; which window on that frame? */
pixel_to_glyph_coords (frame, XINT (x), XINT (y), &column, &row,
......@@ -4055,13 +4031,11 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
XSETINT (posn,
buffer_posn_from_coords (XWINDOW (window), column, row));
}
#ifdef MULTI_FRAME
else if (frame != 0)
{
XSETFRAME (window, frame);
posn = Qnil;
}
#endif
else
{
window = Qnil;
......@@ -4901,11 +4875,7 @@ read_avail_input (expected)
cbuf[i] &= ~0x80;
buf[i].code = cbuf[i];
#ifdef MULTI_FRAME
XSETFRAME (buf[i].frame_or_window, selected_frame);
#else
buf[i].frame_or_window = Qnil;
#endif
}
}
......@@ -7526,12 +7496,10 @@ quit_throw_to_read_char ()
abort ();
#endif
#endif
#ifdef MULTI_FRAME
if (FRAMEP (internal_last_event_frame)
&& XFRAME (internal_last_event_frame) != selected_frame)
do_switch_frame (make_lispy_switch_frame (internal_last_event_frame),
Qnil, 0);
#endif
_longjmp (getcjmp, 1);
}
......@@ -7708,12 +7676,10 @@ init_keyboard ()
#endif
input_pending = 0;
#ifdef MULTI_FRAME
/* This means that command_loop_1 won't try to select anything the first
time through. */
internal_last_event_frame = Qnil;
Vlast_event_frame = internal_last_event_frame;
#endif
#ifdef MULTI_KBOARD
current_kboard = initial_kboard;
......
......@@ -196,15 +196,12 @@ extern Lisp_Object Vfunction_key_map;
extern Lisp_Object this_command_keys;
extern int this_command_key_count;
#ifdef MULTI_FRAME
/* The frame in which the last input event occurred, or Qmacro if the
last event came from a macro. We use this to determine when to
generate switch-frame events. This may be cleared by functions
like Fselect_frame, to make sure that a switch-frame event is
generated by the next character. */
extern Lisp_Object internal_last_event_frame;
#endif
/* Macros for dealing with lispy events. */
......
......@@ -984,19 +984,8 @@ typedef unsigned char UCHAR;
#define GC_CHAR_TABLE_P(x) GC_PSEUDOVECTORP (x, PVEC_CHAR_TABLE)
#define BOOL_VECTOR_P(x) PSEUDOVECTORP (x, PVEC_BOOL_VECTOR)
#define GC_BOOL_VECTOR_P(x) GC_PSEUDOVECTORP (x, PVEC_BOOL_VECTOR)
#ifdef MULTI_FRAME
#define FRAMEP(x) PSEUDOVECTORP (x, PVEC_FRAME)
#define GC_FRAMEP(x) GC_PSEUDOVECTORP (x, PVEC_FRAME)
#else
#ifdef HAVE_MOUSE
/* We could use this in the !HAVE_MOUSE case also, but we prefer a compile-time
error message in case FRAMEP is used. */
#define FRAMEP(x) (EQ (x, Fselected_frame ()))
#define GC_FRAMEP(x) (GC_EQ (x, Fselected_frame ()))
#endif
#endif
#define EQ(x, y) (XFASTINT (x) == XFASTINT (y))
#define GC_EQ(x, y) (XGCTYPE (x) == XGCTYPE (y) && XPNTR (x) == XPNTR (y))
......
......@@ -204,7 +204,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
/* If the minibuffer window is on a different frame, save that
frame's configuration too. */
#ifdef MULTI_FRAME
mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
if (XFRAME (mini_frame) != selected_frame)
record_unwind_protect (Fset_window_configuration,
......@@ -216,7 +215,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
if (minibuffer_auto_raise)
Fraise_frame (mini_frame);
#endif
/* We have to do this after saving the window configuration
since that is what restores the current buffer. */
......@@ -280,10 +278,8 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
}
}
#ifdef MULTI_FRAME
if (XFRAME (mini_frame) != selected_frame)
Fredirect_frame_focus (Fselected_frame (), mini_frame);
#endif
Vminibuf_scroll_window = selected_window;
Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
......
......@@ -1150,7 +1150,6 @@ print (obj, printcharfun, escapeflag)
{
strout ("#<window-configuration>", -1, printcharfun);
}
#ifdef MULTI_FRAME
else if (FRAMEP (obj))
{
strout ((FRAME_LIVE_P (XFRAME (obj))
......@@ -1161,7 +1160,6 @@ print (obj, printcharfun, escapeflag)
strout (buf, -1, printcharfun);
PRINTCHAR ('>');
}
#endif
#endif /* not standalone */
else
{
......
......@@ -42,11 +42,7 @@ Boston, MA 02111-1307, USA. */
#endif
#ifndef BASE_PURESIZE
#ifdef MULTI_FRAME
#define BASE_PURESIZE (325000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
#else
#define BASE_PURESIZE (240000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
#endif
#endif
/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
......
......@@ -1517,10 +1517,8 @@ init_sys_modes ()
else
{
frame_garbaged = 1;
#ifdef MULTI_FRAME
if (FRAMEP (Vterminal_frame))
FRAME_GARBAGED_P (XFRAME (Vterminal_frame)) = 1;
#endif
}
term_initted = 1;
......
......@@ -373,7 +373,6 @@ init_frame_faces (f)
new_computed_face (f, FRAME_PARAM_FACES (f)[1]);
recompute_basic_faces (f);
#ifdef MULTI_FRAME
/* Find another frame. */
{
Lisp_Object tail, frame, result;
......@@ -402,7 +401,6 @@ init_frame_faces (f)
ensure_face_ready (f, i);
}
}
#endif /* MULTI_FRAME */
}
......
This diff is collapsed.
......@@ -418,12 +418,10 @@ message2_nolog (m, len)
mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
#ifdef MULTI_FRAME
FRAME_SAMPLE_VISIBILITY (f);
if (FRAME_VISIBLE_P (selected_frame)
&& ! FRAME_VISIBLE_P (f))
Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window)));
#endif
if (m)
{
......@@ -844,7 +842,6 @@ redisplay_internal (preserve_echo_area)
return;
#endif
#ifdef MULTI_FRAME
if (! FRAME_WINDOW_P (selected_frame)
&& previous_terminal_frame != selected_frame)
{
......@@ -855,7 +852,6 @@ redisplay_internal (preserve_echo_area)
XSETFRAME (Vterminal_frame, selected_frame);
}
previous_terminal_frame = selected_frame;
#endif
/* Set the visible flags for all frames.
Do this before checking for resized or garbaged frames; they want
......@@ -1112,7 +1108,6 @@ redisplay_internal (preserve_echo_area)
unrequest_sigio ();
stop_polling ();
#ifdef MULTI_FRAME
if (all_windows)
{
Lisp_Object tail;
......@@ -1142,7 +1137,6 @@ redisplay_internal (preserve_echo_area)
}
}
else
#endif /* MULTI_FRAME */
{
if (FRAME_VISIBLE_P (selected_frame))
pause = update_frame (selected_frame, 0, 0);
......@@ -3742,12 +3736,10 @@ decode_mode_spec (w, c, spec_width, maxwidth)
case 'F':
/* %F displays the frame name. */
#ifdef MULTI_FRAME
if (!NILP (f->title))
return (char *) XSTRING (f->title)->data;
if (f->explicit_name || ! FRAME_WINDOW_P (f))
return (char *) XSTRING (f->name)->data;
#endif
return "Emacs";
case 'f':
......
......@@ -560,7 +560,6 @@ init_frame_faces (f)
new_computed_face (f, FRAME_PARAM_FACES (f)[1]);
recompute_basic_faces (f);
#ifdef MULTI_FRAME
/* Find another X frame. */
{
Lisp_Object tail, frame, result;
......@@ -589,7 +588,6 @@ init_frame_faces (f)
ensure_face_ready (f, i);
}
}
#endif /* MULTI_FRAME */