changeset 47745:36d9421bf776

(ada-xref-update-project-menu,ada-add-ada-menu): Handle the menu pseudo-keys generated by easymenu which are lowercase in Emacs 21.4.
author Markus Rost <rost@math.uni-bielefeld.de>
date Thu, 03 Oct 2002 18:21:02 +0000
parents 1b89f0ef4d72
children c619d4098aec
files lisp/progmodes/ada-xref.el
diffstat 1 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/progmodes/ada-xref.el	Thu Oct 03 18:20:27 2002 +0000
+++ b/lisp/progmodes/ada-xref.el	Thu Oct 03 18:21:02 2002 +0000
@@ -475,10 +475,14 @@
      (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 @@
 				(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))
       )
     )