From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 7 Feb 1994 01:03:39 +0000 (+0000)
Subject: (menu_bar_item): Use internal_condition_case_1.
X-Git-Tag: emacs-19.34~10043
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=047a8ea77d676f96d26d670528ce436aed98b3e1;p=emacs.git

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

diff --git a/src/keyboard.c b/src/keyboard.c
index da4ca46b676..27894429596 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3586,6 +3586,15 @@ menu_bar_one_keymap (keymap, result)
   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 @@ menu_bar_item (key, item_string, def, result)
 	 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