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.
zielmicha · Jul 31, 2012 · 1861952 · 1861952
1 parent 2c43ae1
commit 1861952
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/ChangeLog b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* 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  <jan.h.d@swipnet.se>
 
 	* nsmenu.m (update_frame_tool_bar): Change key from NSObject* to id.

diff --git a/src/fontset.c b/src/fontset.c
@@ -2117,7 +2117,8 @@ dump_fontset (Lisp_Object fontset)
 
 	  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));

diff --git a/src/w32menu.c b/src/w32menu.c
@@ -854,7 +854,7 @@ w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
 
       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;