(ada-mode-version): Bump version.

(ada-create-keymap): Add \C-c\C-m 'ada-set-main-compile-application.
(ada-create-menu): Add ada-set-main-compile-application, ada-show-current-main,
ada-show-current-project.

1 files changed, 8 insertions, 7 deletions

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 2ca978b5c09..8b9394ab086 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -149,7 +149,7 @@ If IS-XEMACS is non-nil, check for XEmacs instead of Emacs."
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
-  (let ((version-string "3.6w"))
+  (let ((version-string "3.7"))
     (if (interactive-p)
         (message version-string)
       version-string)))
@@ -472,6 +472,7 @@ The extensions should include a `.' if needed.")
   "Syntax table for Ada, where `_' is a word constituent.")
 
 (eval-when-compile
+  ;; These values are used in eval-when-compile expressions.
   (defconst ada-83-string-keywords
     '("abort" "abs" "accept" "access" "all" "and" "array" "at" "begin"
       "body" "case" "constant" "declare" "delay" "delta" "digits" "do"
@@ -1344,12 +1345,6 @@ If you use ada-xref.el:
   (setq local-abbrev-table ada-mode-abbrev-table)
 
   ;;  Support for which-function mode
-  ;; which-function-mode does not work with nested subprograms, since it is
-  ;; based only on the regexps generated by imenu, and thus can only detect the
-  ;; beginning of subprograms, not the end.
-  ;; Fix is: redefine a new function ada-which-function, and call it when the
-  ;; major-mode is ada-mode.
-
   (make-local-variable 'which-func-functions)
   (setq which-func-functions '(ada-which-function))
 
@@ -4622,6 +4617,7 @@ Moves to 'begin' if in a declarative part."
   (define-key ada-mode-map "\C-cc"     'ada-change-prj)
   (define-key ada-mode-map "\C-cd"     'ada-set-default-project-file)
   (define-key ada-mode-map "\C-cg"     'ada-gdb-application)
+  (define-key ada-mode-map "\C-c\C-m"  'ada-set-main-compile-application)
   (define-key ada-mode-map "\C-cr"     'ada-run-application)
   (define-key ada-mode-map "\C-c\C-o"  'ada-goto-parent)
   (define-key ada-mode-map "\C-c\C-r"  'ada-find-references)
@@ -4706,11 +4702,14 @@ Moves to 'begin' if in a declarative part."
               :included (fboundp 'customize-group)]
              ["Check file"    ada-check-current   t]
              ["Compile file"  ada-compile-current t]
+             ["Set main and Build" ada-set-main-compile-application t]
+             ["Show main" ada-show-current-main t]
              ["Build"         ada-compile-application t]
              ["Run"           ada-run-application     t]
              ["Debug"         ada-gdb-application (eq ada-which-compiler 'gnat)]
              ["------"        nil nil]
              ("Project"
+              ["Show project" ada-show-current-project t]
               ["Load..."      ada-set-default-project-file t]
               ["New..."       ada-prj-new                  t]
               ["Edit..."      ada-prj-edit                 t])
@@ -5533,6 +5532,8 @@ This function typically is to be hooked into `ff-file-created-hooks'."
 (autoload 'ada-set-default-project-file     "ada-xref" nil nil)
 (autoload 'ada-set-default-project-file     "ada-xref" nil t)
 (autoload 'ada-xref-goto-previous-reference "ada-xref" nil t)
+(autoload 'ada-set-main-compile-application "ada-xref" nil t)
+(autoload 'ada-show-current-main            "ada-xref" nil t)
 
 (autoload 'ada-customize                    "ada-prj"  nil t)
 (autoload 'ada-prj-edit                     "ada-prj"  nil t)