# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1047775163 0
# Node ID c61cd948bb26bad3ac3fd42424e1d9bfc553d166
# Parent  3770fda038d0bcd15d251387792be4986391d3cd
(easy-menu-name-match): Catch any error that member-ignore-case might signal.
(easy-menu-add-item): Default to the global map, as documented.
(easy-menu-convert-item-1): Use match-string.

diff -r 3770fda038d0 -r c61cd948bb26 lisp/emacs-lisp/easymenu.el
--- a/lisp/emacs-lisp/easymenu.el	Sun Mar 16 00:06:59 2003 +0000
+++ b/lisp/emacs-lisp/easymenu.el	Sun Mar 16 00:39:23 2003 +0000
@@ -343,8 +343,7 @@
 			   (postfix
 			    (if (< (match-end 1) (match-end 0))
 				(substring keys (match-end 1))))
-			   (cmd (intern (substring keys (match-beginning 2)
-						   (match-end 2)))))
+			   (cmd (intern (match-string 2 keys))))
 		       (setq keys (and (or prefix postfix)
 				       (cons prefix postfix)))
 		       (setq keys
@@ -421,10 +420,12 @@
 	  (eq (car-safe item) name)
 	(if (stringp name)
 	    ;; Match against the text that is displayed to the user.
-	    (or (member-ignore-case name item)
+	    (or (condition-case nil (member-ignore-case name item)
+		  (error nil))		;`item' might not be a proper list.
 		;; Also check the string version of the symbol name,
 		;; for backwards compatibility.
-		(eq (car-safe item) (intern name)))))))
+		(eq (car-safe item) (intern name))
+		(eq (car-safe item) (easy-menu-intern name)))))))
 
 (defun easy-menu-always-true (x)
   "Return true if form X never evaluates to nil."
@@ -515,6 +516,9 @@
 ITEM is either defined as in `easy-menu-define' or a non-nil value returned
 by `easy-menu-item-present-p' or `easy-menu-remove-item' or a menu defined
 earlier by `easy-menu-define' or `easy-menu-create-menu'."
+  (unless map
+    (setq map (current-global-map))
+    (push 'menu-bar path))
   (setq map (easy-menu-get-map map path
 			       (and (null map) (null path)
 				    (stringp (car-safe item))