(ada-xref-update-project-menu,ada-add-ada-menu): Handle the menu

pseudo-keys generated by easymenu which are lowercase in Emacs 21.4.

2 files changed, 21 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4496b3111b..b6cb9a9843 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-03  Markus Rost  <[email protected]>
+
+	* progmodes/ada-stmt.el (ada-stmt-add-to-ada-menu):  Handle the
+	menu pseudo-keys generated by easymenu which are lowercase in
+	Emacs 21.4.
+
+	* progmodes/ada-xref.el
+	(ada-xref-update-project-menu,ada-add-ada-menu): Ditto.
+
 2002-10-03  John Paul Wallington  <[email protected]>
 
 	* frame.el (delete-frame-hook): Variable alias for
@@ -22,7 +31,8 @@
 
 2002-10-02  Markus Rost  <[email protected]>
 
-	* progmodes/sh-script.el (sh-alias-alist): Use append instead of nconc.
+	* progmodes/sh-script.el (sh-alias-alist): Use append instead of
+	nconc.
 
 	* startup.el (normal-top-level): Reset standard-value property of
 	`user-full-name' here.
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 9a1f458848..0390ac0485 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -475,10 +475,14 @@ All the directories are returned as absolute directories."
      (or ada-xref-project-files '(nil)))
 
      (if (not ada-xemacs)
-         (if (lookup-key ada-mode-map [menu-bar Ada Project])
-             (setcdr (lookup-key ada-mode-map [menu-bar Ada Project])
-		     submenu)))
-    ))
+         (if (and (lookup-key ada-mode-map [menu-bar Ada])
+		  (lookup-key ada-mode-map [menu-bar Ada Project]))
+	     (setcdr (lookup-key ada-mode-map [menu-bar Ada Project])
+		     submenu)
+	   (if (lookup-key ada-mode-map [menu-bar ada Project])
+	       (setcdr (lookup-key ada-mode-map [menu-bar ada Project])
+		       submenu))))
+     ))
 
 
 ;;-------------------------------------------------------------
@@ -725,8 +729,8 @@ name as was passed to `ada-create-menu'."
 				(not ada-tight-gvd-integration)))
 			:button (:toggle . ada-tight-gvd-integration)) t))
 
-      (define-key ada-mode-map [menu-bar Ada Edit rem3] '("------------" . nil))
-      (define-key ada-mode-map [menu-bar Ada Edit open-file-from-src-path]
+      (define-key edit-menu [rem3] '("------------" . nil))
+      (define-key edit-menu [open-file-from-src-path]
 	'("Search File on source path..." . ada-find-file))
       )
     )