Mercurial > hg > xemacs-beta

diff src/menubar-gtk.c @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 8f1ee2d15784
children 4aebb0131297
line wrap: on
line diff
--- a/src/menubar-gtk.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/menubar-gtk.c	Sat Dec 26 21:18:49 2009 -0600
@@ -666,13 +666,14 @@
 
       if ((!NILP (config_tag)
 	   && NILP (Fmemq (config_tag, Vmenubar_configuration)))
-	  || (included_spec && NILP (Feval (include_p))))
+	  || (included_spec &&
+              NILP (IGNORE_MULTIPLE_VALUES (Feval (include_p)))))
 	{
 	  return (NULL);
 	}
 
       if (active_spec)
-	active_p = Feval (active_p);
+        active_p = IGNORE_MULTIPLE_VALUES (Feval (active_p));
 
       gtk_widget_set_sensitive (GTK_WIDGET (menu_item), ! NILP (active_p));
     }
@@ -853,7 +854,8 @@
 
 #ifdef HAVE_MENUBARS
       if ((!NILP (config_tag) && NILP (Fmemq (config_tag, Vmenubar_configuration)))
-	  || (included_spec && NILP (Feval (include_p))))
+	  || (included_spec && NILP (IGNORE_MULTIPLE_VALUES (Feval (include_p)))))
+
 	{
 	  /* the include specification says to ignore this item. */
 	  return 0;
@@ -866,7 +868,8 @@
 	accel = menu_name_to_accelerator (XSTRING_DATA (name));
 
       if (!NILP (suffix))
-	suffix = Feval (suffix);
+        suffix = IGNORE_MULTIPLE_VALUES (Feval (suffix));
+
 
       if (!separator_string_p (XSTRING_DATA (name)))
 	{
@@ -901,7 +904,7 @@
 	    }
 	  else
 	    {
-	      selected_p = Feval (selected_p);
+              selected_p = IGNORE_MULTIPLE_VALUES (Feval (selected_p));
 	    }
 	}
 
@@ -911,7 +914,7 @@
 	}
       else
 	{
-	  active_p = Feval (active_p);
+          active_p = IGNORE_MULTIPLE_VALUES (Feval (active_p));
 	}
 
       if (0 ||