diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-12-15 02:17:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-12-15 02:17:06 +0000 |
| commit | 727bb0a9fefa27190646ba42878548249677c2c3 (patch) | |
| tree | 295809f2882092211e97f6d42ee9d98368171561 | |
| parent | d454ecd8a62ded7d075a71b620a31a2a2f16fa37 (diff) | |
| download | emacs-727bb0a9fefa27190646ba42878548249677c2c3.tar.gz | |
(x_set_menu_bar_lines) [USE_X_TOOLKIT]:
Don't crash for non-X frame.
| -rw-r--r-- | src/xfns.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index e55dc0bec44..bb3c6fbe3d7 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1697,7 +1697,7 @@ x_set_menu_bar_lines (f, value, oldval) 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 @@ x_set_menu_bar_lines (f, value, oldval) 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; |