From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Aug 2012 14:36:36 +0000 (+0300)
Subject: Fix compilation --with-x-toolkit=no.
X-Git-Tag: emacs-24.2.90~858
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8da0576b32428d46919ee50bf266a489b62d154f;p=emacs.git

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>.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a9d4c50ae2..4b60dd07e73 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/xfns.c b/src/xfns.c
index 5e92fe9b187..8bbb4e1ca51 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -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);