[Emacs-diffs] /srv/bzr/emacs/trunk r109332: Fix some of the breakage introduced with revision 109327.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109332
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-31 19:59:55 +0300
message:
  Fix some of the breakage introduced with revision 109327.
  
   src/w32menu.c (w32_menu_show): Revert bogus introduction of FVAR.
   src/fontset.c (dump_fontset): Fix compilation with ENABLE_CHECKING
   after introduction of FVAR.
modified:
  src/ChangeLog
  src/fontset.c
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-31 16:19:03 +0000
+++ b/src/ChangeLog     2012-07-31 16:59:55 +0000
@@ -1,3 +1,10 @@
+2012-07-31  Eli Zaretskii  <address@hidden>
+
+       * w32menu.c (w32_menu_show): Revert bogus introduction of FVAR.
+
+       * fontset.c (dump_fontset): Fix compilation with ENABLE_CHECKING
+       after introduction of FVAR.
+
 2012-07-31  Jan Djärv  <address@hidden>
 
        * nsmenu.m (update_frame_tool_bar): Change key from NSObject* to id.

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2012-07-11 07:19:44 +0000
+++ b/src/fontset.c     2012-07-31 16:59:55 +0000
@@ -2117,7 +2117,8 @@
 
          if (FRAME_LIVE_P (f))
            ASET (vec, 1,
-                 Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), f->name));
+                 Fcons (FONTSET_NAME (FONTSET_BASE (fontset)),
+                        FVAR (f, name)));
          else
            ASET (vec, 1,
                  Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), Qnil));

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-07-31 12:36:19 +0000
+++ b/src/w32menu.c     2012-07-31 16:59:55 +0000
@@ -854,7 +854,7 @@
 
       wv_title->name = SSDATA (title);
       wv_title->enabled = TRUE;
-      FVAR (wv_title, title) = TRUE;
+      wv_title->title = TRUE;
       wv_title->button_type = BUTTON_TYPE_NONE;
       wv_title->help = Qnil;
       wv_title->next = wv_sep;