[Emacs-diffs] /srv/bzr/emacs/trunk r109431: Fix compilation --with-x-toolkit=no.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109431
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-08-04 17:36:36 +0300
message:
  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 <address@hidden>.
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-04 14:33:00 +0000
+++ b/src/ChangeLog     2012-08-04 14:36:36 +0000
@@ -1,3 +1,9 @@
+2012-08-04  Eli Zaretskii  <address@hidden>
+
+       * xfns.c (x_set_menu_bar_lines): Fix compilation error in
+       --with-x-toolkit=no builds.
+       Reported by Carsten Mattner <address@hidden>.
+
 2012-08-04  Chong Yidong  <address@hidden>
 
        * syntax.c (Fmodify_syntax_entry): Doc fix.

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2012-08-03 23:36:11 +0000
+++ b/src/xfns.c        2012-08-04 14:36:36 +0000
@@ -1253,8 +1253,8 @@
          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);