# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 760583019 0
# Node ID 995860e5f3423d4ec7696e19bd56de6c8d963c88
# Parent  cc9d9ab24008c70613e615c96ff47ffbd1e1f7ad
(menu_bar_item): Use internal_condition_case_1.
(menu_bar_item_1): New function.

diff -r cc9d9ab24008 -r 995860e5f342 src/keyboard.c
--- a/src/keyboard.c	Mon Feb 07 01:02:05 1994 +0000
+++ b/src/keyboard.c	Mon Feb 07 01:03:39 1994 +0000
@@ -3586,6 +3586,15 @@
   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;
@@ -3610,7 +3619,10 @@
 	 Otherwise, enable if value is not nil.  */
       tem = Fget (def, Qmenu_enable);
       if (!NILP (tem))
-	enabled = Feval (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