comparison src/keyboard.c @ 5808:995860e5f342

(menu_bar_item): Use internal_condition_case_1. (menu_bar_item_1): New function.

5807:cc9d9ab24008

    }

  return result;
}

static Lisp_Object
menu_bar_item (key, item_string, def, result)
     Lisp_Object key, item_string, def, result;
{
  Lisp_Object tem;

    {
      /* No property, or nil, means enable.
	 Otherwise, enable if value is not nil.  */
      tem = Fget (def, Qmenu_enable);
      if (!NILP (tem))
	enabled = Feval (tem);
    }

  /* Add an entry for this key and string
     if there is none yet.  */
  tem = Fassq (key, result);

5808:995860e5f342

    }

  return result;
}

/* This is used as the handler when calling internal_condition_case_1.  */

static Lisp_Object
menu_bar_item_1 (arg)
     Lisp_Object arg;
{
  return Qnil;
}

static Lisp_Object
menu_bar_item (key, item_string, def, result)
     Lisp_Object key, item_string, def, result;
{
  Lisp_Object tem;

    {
      /* No property, or nil, means enable.
	 Otherwise, enable if value is not nil.  */
      tem = Fget (def, Qmenu_enable);
      if (!NILP (tem))
	/* (condition-case nil (eval tem)
	     (error nil))  */
	enabled = internal_condition_case_1 (Feval, tem, Qerror,
					     menu_bar_item_1);
    }

  /* Add an entry for this key and string
     if there is none yet.  */
  tem = Fassq (key, result);