diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index a09c3d6d511..46d9cc2f080 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -596,7 +596,7 @@ update: 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 @@ display_mode_line (w) 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 @@ display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt) /* 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 @@ decode_mode_spec (w, c, maxwidth) case '-': { - static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------"; register char *p; register int i; @@ -2149,6 +2150,7 @@ decode_mode_spec (w, c, maxwidth) /* 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 @@ init_xdisp () 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; |