--- a/src/gui.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/gui.c	Sat Dec 26 21:18:49 2009 -0600
@@ -382,7 +382,6 @@
 gui_item_value (Lisp_Object form)
 {
   /* This function can call Lisp. */
-
 #ifndef ERROR_CHECK_DISPLAY
   /* Shortcut to avoid evaluating Qt/Qnil each time; but don't do it when
      error-checking so we catch unprotected eval within redisplay quicker */
@@ -391,7 +390,9 @@
   if (EQ (form, Qt))
     return 1;
 #endif
-  return !NILP (in_display ? eval_within_redisplay (form) : Feval (form));
+  return !NILP (in_display ?
+                IGNORE_MULTIPLE_VALUES (eval_within_redisplay (form))
+                : IGNORE_MULTIPLE_VALUES (Feval (form)));
 }
 
 /*
@@ -507,6 +508,7 @@
       if (!STRINGP (suffix))
 	{
 	  suffix = Feval (suffix);
+          suffix = IGNORE_MULTIPLE_VALUES (suffix);
 	  CHECK_STRING (suffix);
 	}
 
@@ -800,17 +802,12 @@
   RETURN_UNGCPRO (ret);
 }
 
-static void
-finalize_gui_item (void *UNUSED (header), int UNUSED (for_disksave))
-{
-}
-
-DEFINE_NONDUMPABLE_LISP_OBJECT ("gui-item", gui_item,
-					   mark_gui_item, print_gui_item,
-					   finalize_gui_item, gui_item_equal,
-					   gui_item_hash,
-					   gui_item_description,
-					   Lisp_Gui_Item);
+DEFINE_NODUMP_LISP_OBJECT ("gui-item", gui_item,
+			       mark_gui_item, print_gui_item,
+			       0, gui_item_equal,
+			       gui_item_hash,
+			       gui_item_description,
+			       Lisp_Gui_Item);
 
 DOESNT_RETURN
 gui_error (const Ascbyte *reason, Lisp_Object frob)