X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmenubar.el;h=cdf247bd20789818a2a3b0501863e6d99c3120ae;hb=8b6a943578dd26817b7514ccb0c19119c314ec60;hp=4ac3cf64610eaaac935db1bfe3e61945f8d465fe;hpb=fc475e6669a613cd6d98eb5511c749a23b63c7ac;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/menubar.el b/lisp/menubar.el
index 4ac3cf6..cdf247b 100644
--- a/lisp/menubar.el
+++ b/lisp/menubar.el
@@ -30,7 +30,7 @@
 
 ;; This file is dumped with XEmacs (when menubar support is compiled in).
 
-;; Some stuff in FSF menu-bar.el is in x-menubar.el
+;; Some stuff in FSF menu-bar.el is in menubar-items.el
 
 ;;; Code:
 
@@ -128,19 +128,6 @@ See `current-menubar' for a description of the syntax of a menubar."
 			     menuitem)))
 	  (setq plistp (or (>= L 5)
 			   (and (> L 2) (keywordp (aref menuitem 2)))))
-	  (or (stringp (aref menuitem 0))
-	      (signal 'error
-		      (list
-		       "first element of a button must be a string (the label)"
-		       menuitem)))
-	  (or plistp
-	      (< L 4)
-	      (null (aref menuitem 3))
-	      (stringp (aref menuitem 3))
-	      (signal 'error
-		      (list
-		       "fourth element of a button must be a string (the label suffix)"
-		       menuitem)))
 	  (if plistp
 	      (let ((i 2)
 		    selp
@@ -171,8 +158,8 @@ See `current-menubar' for a description of the syntax of a menubar."
 			     menuitem)))
 		)))
 	)
-       ;; (t (signal 'error (list "unrecognised menu descriptor" menuitem))))
-       (t (message "unrecognised menu descriptor %s" (prin1-to-string menuitem))))
+       ;; (t (signal 'error (list "unrecognized menu descriptor" menuitem))))
+       (t (message "unrecognized menu descriptor %s" (prin1-to-string menuitem))))
       (setq menu (cdr menu)))))