# HG changeset patch # User Richard M. Stallman # Date 818993826 0 # Node ID 714433bead7f6a8a951404ddf07517b7f7747f3e # Parent e51b69e606146c1ad332b68ca170530458d52289 (x_set_menu_bar_lines) [USE_X_TOOLKIT]: Don't crash for non-X frame. diff -r e51b69e60614 -r 714433bead7f src/xfns.c --- a/src/xfns.c Fri Dec 15 02:13:54 1995 +0000 +++ b/src/xfns.c Fri Dec 15 02:17:06 1995 +0000 @@ -1697,7 +1697,7 @@ if (nlines) { FRAME_EXTERNAL_MENU_BAR (f) = 1; - if (f->output_data.x->menubar_widget == 0) + if (FRAME_X_P (f) && f->output_data.x->menubar_widget == 0) /* Make sure next redisplay shows the menu bar. */ XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = Qt; } @@ -1706,7 +1706,8 @@ if (FRAME_EXTERNAL_MENU_BAR (f) == 1) free_frame_menubar (f); FRAME_EXTERNAL_MENU_BAR (f) = 0; - f->output_data.x->menubar_widget = 0; + if (FRAME_X_P (f)) + f->output_data.x->menubar_widget = 0; } #else /* not USE_X_TOOLKIT */ FRAME_MENU_BAR_LINES (f) = nlines;