# HG changeset patch # User Jim Blandy <jimb@redhat.com> # Date 714206583 0 # Node ID d42877206c0a4ffdb0ab6ec4e9708a64ba8af73b # Parent 817b0ce337d7c789edec287bb4daca97a6679e83 * xdisp.c (display_mode_line): Use x_implicitly_set_name here. * xdisp.c (redisplay, init_xdisp): Use FRAME_ROOT_WINDOW instead of minibuf_window->prev. * xdisp.c (decode_mode_spec): Move lots_of_dashes outside of the function; Emacs can't use static initialized arrays inside functions. diff -r 817b0ce337d7 -r d42877206c0a src/xdisp.c --- a/src/xdisp.c Wed Aug 19 06:40:02 1992 +0000 +++ b/src/xdisp.c Wed Aug 19 06:43:03 1992 +0000 @@ -596,7 +596,7 @@ XFASTINT (w->last_point_y) = FRAME_CURSOR_Y (selected_frame); if (all_windows) - mark_window_display_accurate (XWINDOW (minibuf_window)->prev, 1); + mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1); else { w->update_mode_line = Qnil; @@ -1781,10 +1781,10 @@ if (FRAME_X_P (f) && ! FRAME_MINIBUF_ONLY_P (f) && w == XWINDOW (f->selected_window)) - x_set_name (f, ((XINT (Flength (Vframe_list)) > 1) - ? XBUFFER (w->buffer)->name - : Qnil), - Qnil); + x_implicitly_set_name (f, ((XINT (Flength (Vframe_list)) > 1) + ? XBUFFER (w->buffer)->name + : Qnil), + Qnil); #endif } @@ -1999,6 +1999,8 @@ /* Return a string for the output of a mode line %-spec for window W, generated by character C and width MAXWIDTH. */ +static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------"; + static char * decode_mode_spec (w, c, maxwidth) struct window *w; @@ -2125,7 +2127,6 @@ case '-': { - static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------"; register char *p; register int i; @@ -2149,6 +2150,7 @@ /* Display STRING on one line of window W, starting at HPOS. Display at position VPOS. Caller should have done get_display_line. + If VPOS == -1, display it as the current frame's title. TRUNCATE is GLYPH to display at end if truncated. Zero for none. @@ -2327,7 +2329,7 @@ this_line_bufpos = 0; mini_w = XWINDOW (minibuf_window); - root_window = mini_w->prev; + root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); echo_area_glyphs = 0; previous_echo_glyphs = 0;