Fix compilation --with-x-toolkit=no.

stc/xfns.c (x_set_menu_bar_lines): Fix compilation error in
 --with-x-toolkit=no builds by using FVAR.
 Reported by Carsten Mattner <carstenmattner@gmail.com>.
This commit is contained in:
Eli Zaretskii 2012-08-04 17:36:36 +03:00
parent 02676e5d3d
commit 8da0576b32
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2012-08-04 Eli Zaretskii <eliz@gnu.org>
* xfns.c (x_set_menu_bar_lines): Fix compilation error in
--with-x-toolkit=no builds.
Reported by Carsten Mattner <carstenmattner@gmail.com>.
2012-08-04 Chong Yidong <cyd@gnu.org>
* syntax.c (Fmodify_syntax_entry): Doc fix.

View file

@ -1253,8 +1253,8 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
UNBLOCK_INPUT;
}
if (nlines == 0 && WINDOWP (f->menu_bar_window))
clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
if (nlines == 0 && WINDOWP (FVAR (f, menu_bar_window)))
clear_glyph_matrix (XWINDOW (FVAR (f, menu_bar_window))->current_matrix);
}
#endif /* not USE_X_TOOLKIT && not USE_GTK */
adjust_glyphs (f);