emacs: lisp/progmodes/ada-xref.el comparison

comparison lisp/progmodes/ada-xref.el @ 30408:e3e2c9051c5f

Got rid of all byte-compiler warnings on Emacs. Add to the menu when the file is loaded, not in ada-mode-hook. Add -toolbar to the default ddd command Switches moved from ada-prj-default-comp-cmd and ada-prj-default-make-cmd to ada-prj-default-comp-opt (ada-add-ada-menu): Remove the map and name parameters Add the Ada Reference Manual to the menu (ada-check-current): rewritten as a call to ada-compile-current (ada-compile): Removed. (ada-compile-application, ada-compile-current, ada-check-current): Set the compilation-search-path so that compile.el automatically finds the sources in src_dir. Automatic scrollong of the compilation buffer. C-uC-cC-c asks for confirmation before compiling (ada-compile-current): New parameter, prj-field (ada-complete-identifier): Load the .ali file before doing processing (ada-find-ali-file-in-dir): prepend build_dir to obj_dir to conform to gnatmake's behavior. (ada-find-file-in-dir): New function (ada-find-references): Set the environment variables for gnatfind (ada-find-src-file-in-dir): New function. (ada-first-non-nil): Removed (ada-gdb-application): Add support for jdb, the java debugger. (ada-get-ada-file-name): Load the original-file first if not done yet. (ada-get-all-references): Handles the new ali syntax (parent types are found between <>). (ada-initialize-runtime-library): New function (ada-mode-hook): Always load a project file when a file is opened, so that the casing exceptions are correctly read. (ada-operator-re): Add all missing operators ("abs", "rem", "**"). (ada-parse-prj-file): Use find-file-noselect instead of find-file to open the project file, since the latter does not work with speedbar Get default values before loading the prj file, or the default executable file name is wrong. Use the absolute value of src_dir to initialize ada-search-directories and compilation-search-path,... Add the standard runtime library to the search path for find-file. (ada-prj-default-debugger): Was missing an opening '{' (ada-prj-default-bind-opt, ada-prj-default-link-opt): New variables. (ada-prj-default-gnatmake-opt): New variable (ada-prj-find-prj-file): Handles non-file buffers For non-Ada buffers, the project file is the default one Save the windows configuration before displaying the menu. (ada-prj-src-dir, ada-prj-obj-dir, ada-prj-comp-opt,...): Removed (ada-read-identifier): Fix xrefs on operators (for "mod", "and", ...) regexp-quote identifiers names to support operators +, -,... in regexps. (ada-remote): New function. (ada-run-application): Erase the output buffer before starting the run Support remote execution of the application. Use call-process, or the arguments are incorrectly parsed (ada-set-default-project-file): Reread the content of the active project file, not the one from the current buffer When a project file is set as the default project, all directories are automatically associated with it. (ada-set-environment): New function (ada-treat-cmd-string): New special variable ${current} (ada-treat-cmd-string): Revised. The substitution is now done for any ${...} substring (ada-xref-current): If no body was found, compiles the spec instead. Setup ADA_{SOURCE,OBJECTS}_PATH before running the compiler to get rid of command line length limitations. (ada-xref-get-project-field): New function (ada-xref-project-files): New variable (ada-xref-runtime-library-specs-path) (ada-xref-runtime-library-ali-path): New variables (ada-xref-set-default-prj-values): Default run command now does a cd to the build directory. New field: main_unit Provide a default file name even if the current buffer has no prj file.

author	Gerd Moellmann <gerd@gnu.org>
date	Mon, 24 Jul 2000 11:13:11 +0000
parents	1be4a89d81d3
children	0f1f7e931493

comparison

equal deleted inserted replaced

-:b88ff2eabd4e
+:e3e2c9051c5f
-;; @(#) ada-xref.el --- use Gnat for lookup and completion in Ada mode
+;; @(#) ada-xref.el --for lookup and completion in Ada mode
-;; Copyright (C) 1994, 1995--1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1999 Free Software Foundation, Inc.
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
 ;;      Emmanuel Briot <briot@gnat.com>
 ;; Maintainer: Emmanuel Briot <briot@gnat.com>
-;; Ada Core Technologies's version:   $Revision: 1.75 $
+;; Ada Core Technologies's version:   $Revision: 1.99 $
 ;; Keywords: languages ada xref
 ;; This file is not part of GNU Emacs.
 ;; This program is free software; you can redistribute it and/or modify
 ;; ----- Requirements -----------------------------------------------------
 (require 'compile)
 (require 'comint)
-;; ----- Dynamic byte compilation -----------------------------------------
-(defvar byte-compile-dynamic nil)
-(make-local-variable 'byte-compile-dynamic)
-(setq byte-compile-dynamic t)
 ;; ------ Use variables
 (defcustom ada-xref-other-buffer t
 "*If nil, always display the cross-references in the same buffer.
 Otherwise create either a new buffer or a new frame."
 :type 'boolean :group 'ada)
 (defcustom ada-krunch-args "0"
 "*Maximum number of characters for filenames created by gnatkr.
 Set to 0, if you don't use crunched filenames. This should be a string."
 :type 'string :group 'ada)
+(defcustom ada-prj-default-comp-opt "-gnatq"
+"Default compilation options."
+:type 'string :group 'ada)
+(defcustom ada-prj-default-bind-opt ""
+"Default binder options."
+:type 'string :group 'ada)
+(defcustom ada-prj-default-link-opt ""
+"Default linker options."
+:type 'string :group 'ada)
+(defcustom ada-prj-default-gnatmake-opt "-g"
+"Default options for gnatmake."
+:type 'string :group 'ada)
 (defcustom ada-prj-default-comp-cmd
-"${cross_prefix}gcc -c -g -gnatq ${comp_opt} -I${src_dir}"
+"${cross_prefix}gcc -c ${comp_opt}"
 "*Default command to be used to compile a single file.
-Emacs will add the filename at the end of this command.
+Emacs will add the filename at the end of this command. This is the same
-This is the same syntax as in the project file."
+syntax as in the project file."
 :type 'string :group 'ada)
+(defcustom ada-prj-default-debugger "${cross_prefix}gdb"
+"*Default name of the debugger. We recommend either `gdb',
+`gdb --emacs_gdbtk' or `ddd --tty -fullname'."
+:type 'string :group 'ada)
 (defcustom ada-prj-default-make-cmd
-(concat "${cross_prefix}gnatmake ${main} -aI${src_dir} -aO${obj_dir} "
+(concat "${cross_prefix}gnatmake -o ${main} ${main_unit} ${gnatmake_opt} "
-"-g -gnatq -cargs ${comp_opt} "
+"-cargs ${comp_opt} -bargs ${bind_opt} -largs ${link_opt}")
-"-bargs ${bind_opt} -largs ${link_opt}")
 "*Default command to be used to compile the application.
 This is the same syntax as in the project file."
 :type 'string :group 'ada)
 (defcustom ada-prj-default-project-file ""
 This has the same syntax as in the project file (with variable substitution)."
 :type 'string :group 'ada)
 (defcustom ada-always-ask-project nil
 "*If nil, use default values when no project file was found.
-Otherwise, ask the user for the name of the project file to use.")
+Otherwise, ask the user for the name of the project file to use."
+:type 'boolean :group 'ada)
 ;; ------- Nothing to be modified by the user below this
 (defvar ada-last-prj-file ""
 "Name of the last project file entered by the user.")
-(defvar ada-check-switch " -gnats "
+(defvar ada-check-switch "-gnats"
 "Switch added to the command line to check the current file.")
 (defvar ada-project-file-extension ".adp"
 "The extension used for project files.")
 (defconst is-windows (memq system-type (quote (windows-nt)))
 "True if we are running on windows NT or windows 95.")
+(defvar ada-xref-runtime-library-specs-path '()
+"Directories where the specs for the standard library is found.
+This is used for cross-references.")
+(defvar ada-xref-runtime-library-ali-path '()
+"Directories where the ali for the standard library is found.
+This is used for cross-references.")
 (defvar ada-xref-pos-ring '()
 "List of positions selected by the cross-references functions.
 Used to go back to these positions.")
 (defconst ada-xref-pos-ring-max 16
 "Number of positions kept in the list ada-xref-pos-ring.")
 (defvar ada-operator-re
-"\\+\\|-\\|/\\|\\*\\|=\\|mod\\|and\\|not\\|or\\|xor\\|<=\\|<\\|>=\\|>"
+"\\+\\|-\\|/\\|\\*\\*\\|\\*\\|=\\|&\\|abs\\|mod\\|rem\\|and\\|not\\|or\\|xor\\|<=\\|<\\|>=\\|>"
 "Regexp to match for operators.")
 (defvar ada-xref-default-prj-file nil
 "Name of the default prj file, per directory.
 Every directory is potentially associated with a default project file.
 If it is nil, then the first prj file loaded will be the default for this
 Emacs session.")
-;; These variables will be overwritted by buffer-local variables
+(defvar ada-xref-project-files '()
+"Associative list of project files.
+It has the following format:
+((project_name . value) (project_name . value) ...)
+As always, the values of the project file are defined through properties.")
 (defvar ada-prj-prj-file nil
-"Name of the project file for the current ada buffer.")
+"Buffer local variable that specifies the name of the project file.
-(defvar ada-prj-src-dir nil
+Getting the project is done by looking up the key in ada-pxref-project-file.")
-"List of directories to look into for ada sources.")
-(defvar ada-prj-obj-dir nil
+(defun my-local-variable-if-set-p (variable &optional buffer)
-"List of directories to look into for object and .ali files.")
+"Returns t if VARIABLE is local in BUFFER and is non-nil."
-(defvar ada-prj-comp-opt nil
+(and (local-variable-p variable buffer)
-"Switches to use on the command line for the default compile command.")
+(save-excursion
-(defvar ada-prj-bind-opt nil
+(set-buffer buffer)
-"Switches to use on the command line for the default bind command.")
+(symbol-value variable))))
-(defvar ada-prj-link-opt nil
-"Switches to use on the command line for the default link command.")
+(defun ada-initialize-runtime-library ()
-(defvar ada-prj-comp-cmd nil
+"Initializes the variables for the runtime library location."
-"Command to use to compile the current file only.")
+(save-excursion
-(defvar ada-prj-make-cmd nil
+(set 'ada-xref-runtime-library-specs-path '())
-"Command to use to compile the whole current application.")
+(set 'ada-xref-runtime-library-ali-path '())
-(defvar ada-prj-run-cmd nil
+(set-buffer (get-buffer-create "*gnatls*"))
-"Command to use to run the current application.")
+(widen)
-(defvar ada-prj-debug-cmd nil
+(erase-buffer)
-"Command to use to run the debugger.")
+;;  Catch any error in the following form (i.e gnatls was not found)
-(defvar ada-prj-main nil
+(condition-case nil
-"Name of the main programm of the current application.")
+	;;  Even if we get an error, delete the *gnatls* buffer
-(defvar ada-prj-remote-machine nil
+	(unwind-protect
-"Name of the machine to log on before a compilation.")
+	    (progn
-(defvar ada-prj-cross-prefix nil
+	      (call-process "gnatls" nil t nil "-v")
-"Prefix to be added to the gnatmake, gcc, ... commands when
+	      (goto-char (point-min))
-using a cross-compilation environment.
-A '-' is automatically added at the end if not already present.
+	      ;;  Source path
-For instance, the compiler is called `ada-prj-cross-prefix'gnatmake.")
+	      (search-forward "Source Search Path:")
+	      (forward-line 1)
+	      (while (not (looking-at "^$"))
+		(back-to-indentation)
+		(unless (looking-at "<Current_Directory>")
+		  (add-to-list 'ada-xref-runtime-library-specs-path
+			       (buffer-substring-no-properties
+				(point)
+				  (save-excursion (end-of-line) (point)))))
+		(forward-line 1))
+	      ;;  Object path
+	      (search-forward "Object Search Path:")
+	      (forward-line 1)
+	      (while (not (looking-at "^$"))
+		(back-to-indentation)
+		(unless (looking-at "<Current_Directory>")
+		  (add-to-list 'ada-xref-runtime-library-ali-path
+			       (buffer-substring-no-properties
+				(point)
+				(save-excursion (end-of-line) (point)))))
+		(forward-line 1))
+	      )
+	    (kill-buffer nil))
+(error nil))
+(set 'ada-xref-runtime-library-specs-path
+	 (reverse ada-xref-runtime-library-specs-path))
+(set 'ada-xref-runtime-library-ali-path
+	 (reverse ada-xref-runtime-library-ali-path))
+))
+(defun ada-treat-cmd-string (cmd-string)
+"Replace meta-sequences like ${...} in CMD-STRING with the appropriate value.
+The project file must have been loaded first.
+As a special case, ${current} is replaced with the name of the currently
+edited file, minus extension but with directory."
+(while (string-match "\\(-[^-\$IO]*[IO]\\)?\${\\([^}]+\\)}" cmd-string)
+(let (value)
+(if (string= (match-string 2 cmd-string) "current")
+	  (set 'value (file-name-sans-extension (buffer-file-name)))
+	(save-match-data
+	  (set 'value (ada-xref-get-project-field
+		       (intern (match-string 2 cmd-string))))))
+(cond
+((null value)
+	(set 'cmd-string (replace-match "" t t cmd-string)))
+((stringp value)
+	(set 'cmd-string (replace-match value t t cmd-string)))
+((listp value)
+	(let ((prefix (match-string 1 cmd-string)))
+	  (set 'cmd-string (replace-match
+			    (mapconcat (lambda(x) (concat prefix x)) value " ")
+			    t t cmd-string)))))
+))
+cmd-string)
+(defun ada-xref-set-default-prj-values (symbol ada-buffer)
+"Reset the properties in SYMBOL to the default values for ADA-BUFFER."
+(let ((file      (buffer-file-name ada-buffer))
+	plist)
+(save-excursion
+(set-buffer ada-buffer)
+(set 'plist
+	   ;;  Try hard to find a default value for filename, so that the user
+	   ;;  can edit his project file even if the current buffer is not an
+	   ;;  Ada file or not even associated with a file
+	   (list 'filename        (cond
+				   (file
+				    (ada-prj-get-prj-dir file))
+				   (ada-prj-prj-file
+				    ada-prj-prj-file)
+				   (ada-xref-default-prj-file
+				    ada-xref-default-prj-file)
+				   (t
+				    (error (concat "Not editing an Ada file,"
+						   "and no default project "
+						   "file specified!"))))
+		 'build_dir       (file-name-as-directory (expand-file-name "."))
+		 'src_dir         (list ".")
+		 'obj_dir         (list ".")
+		 'casing          (if (listp ada-case-exception-file)
+				      ada-case-exception-file
+				    (list ada-case-exception-file))
+		 'comp_opt        ada-prj-default-comp-opt
+		 'bind_opt        ada-prj-default-bind-opt
+		 'link_opt        ada-prj-default-link-opt
+		 'gnatmake_opt    ada-prj-default-gnatmake-opt
+		 'main            (if file
+				      (file-name-sans-extension file)
+				    "")
+		 'main_unit       (if file
+				      (file-name-nondirectory
+				       (file-name-sans-extension file))
+				    "")
+		 'cross_prefix    ""
+		 'remote_machine  ""
+		 'comp_cmd        (concat "cd ${build_dir} && "
+					  ada-prj-default-comp-cmd)
+		 'check_cmd       (concat ada-prj-default-comp-cmd " "
+					  ada-check-switch)
+		 'make_cmd        (concat "cd ${build_dir} && "
+					  ada-prj-default-make-cmd)
+		 'run_cmd         (concat "cd ${build_dir} && ${main}"
+					  (if is-windows ".exe"))
+		 'debug_cmd       (concat ada-prj-default-debugger
+					  (if is-windows " ${main}.exe"
+					    " ${main}"))))
+)
+(set symbol plist)))
+(defun ada-xref-get-project-field (field)
+"Extract the value of FIELD from the project file of the current buffer.
+The project file must have been loaded first.
+A default value is returned if the file was not found."
+(let ((file-name ada-prj-prj-file)
+	file value)
+;;  If a default project file was set, use it if no other project
+;;  file was specified for the buffer
+(if (and (not file-name)
+	     ada-prj-default-project-file
+	     (not (string= ada-prj-default-project-file "")))
+	(set 'file-name ada-prj-default-project-file))
+(set 'file (assoc file-name ada-xref-project-files))
+;;  If the file was not found, use the default values
+(if file
+	;;  Get the value from the file
+	(set 'value (plist-get (cdr file) field))
+;; Create a default nil file that contains the default values
+(ada-xref-set-default-prj-values 'value (current-buffer))
+(add-to-list 'ada-xref-project-files (cons nil value))
+(set 'value (plist-get value field))
+)
+(if (stringp value)
+	(ada-treat-cmd-string value)
+value))
+)
 ;; ----- Keybindings ------------------------------------------------------
 (defun ada-add-keymap ()
 "Add new key bindings when using `ada-xrel.el'."
 (define-key ada-mode-map "\C-co"    'ff-find-other-file)
 (define-key ada-mode-map "\C-c5\C-d" 'ada-goto-declaration-other-frame)
 (define-key ada-mode-map "\C-c\C-d" 'ada-goto-declaration)
 (define-key ada-mode-map "\C-c\C-s" 'ada-xref-goto-previous-reference)
 (define-key ada-mode-map "\C-c\C-x" 'ada-reread-prj-file)
-(define-key ada-mode-map [f10] 'next-error)
 (define-key ada-mode-map "\C-c\C-c" 'ada-compile-application)
 (define-key ada-mode-map "\C-cb"  'ada-buffer-list)
 (define-key ada-mode-map "\C-cc"  'ada-change-prj)
 (define-key ada-mode-map "\C-cd"  'ada-change-default-prj)
 (define-key ada-mode-map "\C-cg"  'ada-gdb-application)
 (define-key ada-mode-map "\C-c\C-v" 'ada-check-current)
 )
 ;; ----- Menus --------------------------------------------------------------
 (defun ada-add-ada-menu ()
-"Add some items to the standard Ada mode menu."
+"Add some items to the standard Ada mode menu.
+The items are added to the menu called NAME, which should be the same
+name as was passed to `ada-create-menu'."
 (interactive)
 (if ada-xemacs
-(progn
+(let* ((menu-list '("Ada"))
-(add-menu-button '("Ada") ["Check file" ada-check-current t] "Goto")
+	     (goto-menu '("Ada" "Goto"))
-(add-menu-button '("Ada") ["Compile file" ada-compile-current t]
+	     (edit-menu '("Ada" "Edit"))
-			 "Goto")
+	     (help-menu '("Ada" "Help"))
-(add-menu-button '("Ada") ["Build" ada-compile-application t] "Goto")
+	     (options-menu (list "Ada" "Options")))
-(add-menu-button '("Ada") ["Run" ada-run-application t] "Goto")
+	(funcall (symbol-function 'add-menu-button)
-(add-menu-button '("Ada") ["Debug" ada-gdb-application t] "Goto")
+		 menu-list ["Check file" ada-check-current
-(add-menu-button '("Ada") ["--" nil t] "Goto")
+			    (string= mode-name "Ada")] "Goto")
-(add-submenu '("Ada") '("Project"
+	(funcall (symbol-function 'add-menu-button)
-["Associate"   ada-change-prj t]
+		 menu-list ["Compile file" ada-compile-current
-["Set Default" ada-set-default-project-file t]
+			    (string= mode-name "Ada")] "Goto")
-["List" ada-buffer-list t])
+	(funcall (symbol-function 'add-menu-button)
-"Goto")
+		 menu-list ["Build" ada-compile-application t] "Goto")
-(add-menu-button '("Ada" "Goto") ["Goto Parent Unit" ada-goto-parent t]
+	(funcall (symbol-function 'add-menu-button)
-"Next compilation error")
+		 menu-list ["Run" ada-run-application t] "Goto")
-(add-menu-button '("Ada" "Goto") ["Goto References to any entity"
+	(funcall (symbol-function 'add-menu-button)
-					  ada-find-any-references t]
+		 menu-list ["Debug" ada-gdb-application t] "Goto")
-"Next compilation error")
+	(funcall (symbol-function 'add-menu-button)
-(add-menu-button '("Ada" "Goto") ["List References"
+		 menu-list ["--" nil t] "Goto")
-					  ada-find-references t]
+	(funcall (symbol-function 'add-submenu)
-"Next compilation error")
+		 menu-list '("Project"
-(add-menu-button '("Ada" "Goto") ["Goto Declaration Other Frame"
+			     ["Associate"   ada-change-prj t]
-ada-goto-declaration-other-frame t]
+			     ["Set Default..." ada-set-default-project-file t]
-"Next compilation error")
+			     ["List" ada-buffer-list t])
-(add-menu-button '("Ada" "Goto") ["Goto Declaration/Body"
+		 "Goto")
-					  ada-goto-declaration t]
+	(funcall (symbol-function 'add-menu-button)
-"Next compilation error")
+		 goto-menu ["Goto Parent Unit" ada-goto-parent t]
-(add-menu-button '("Ada" "Goto") ["Goto Previous Reference"
+		 "Next compilation error")
-					  ada-xref-goto-previous-reference t]
+	(funcall (symbol-function 'add-menu-button)
-"Next compilation error")
+		 goto-menu ["Goto References to any entity"
-(add-menu-button '("Ada" "Goto") ["--" nil t]
+			    ada-find-any-references t]
-"Next compilation error")
+		 "Next compilation error")
-(add-menu-button '("Ada" "Edit") ["Complete Identifier"
+	(funcall (symbol-function 'add-menu-button)
-					  ada-complete-identifier t]
+		 goto-menu ["List References" ada-find-references t]
-"Indent Line")
+		 "Next compilation error")
-(add-menu-button '("Ada" "Edit") ["--------" nil t]
+	(funcall (symbol-function 'add-menu-button)
-"Indent Line")
+		 goto-menu ["Goto Declaration Other Frame"
-	(add-menu-button '("Ada" "Help") ["Gnat User Guide" (info "gnat_ug")])
+			    ada-goto-declaration-other-frame t]
-	(add-menu-button '("Ada" "Help") ["Gnat Reference Manual"
+		 "Next compilation error")
-					  (info "gnat_rm")])
+	(funcall (symbol-function 'add-menu-button)
-	(add-menu-button '("Ada" "Help") ["Gcc Documentation" (info "gcc")])
+		 goto-menu ["Goto Declaration/Body"
-	(add-menu-button '("Ada" "Help") ["Gdb Documentation" (info "gdb")])
+			    ada-goto-declaration t]
-)
+		 "Next compilation error")
+	(funcall (symbol-function 'add-menu-button)
+		 goto-menu ["Goto Previous Reference"
+			    ada-xref-goto-previous-reference t]
+		 "Next compilation error")
+	(funcall (symbol-function 'add-menu-button)
+		 goto-menu ["--" nil t] "Next compilation error")
+	(funcall (symbol-function 'add-menu-button)
+		 edit-menu ["Complete Identifier"
+			    ada-complete-identifier t]
+		 "Indent Line")
+	(funcall (symbol-function 'add-menu-button)
+		 edit-menu ["--------" nil t] "Indent Line")
+	(funcall (symbol-function 'add-menu-button)
+		 help-menu ["Gnat User Guide" (info "gnat_ug")])
+	(funcall (symbol-function 'add-menu-button)
+		 help-menu ["Gnat Reference Manual" (info "gnat_rm")])
+	(funcall (symbol-function 'add-menu-button)
+		 help-menu ["Gcc Documentation" (info "gcc")])
+	(funcall (symbol-function 'add-menu-button)
+		 help-menu ["Gdb Documentation" (info "gdb")])
+	(funcall (symbol-function 'add-menu-button)
+		 help-menu ["Ada95 Reference Manual" (info "arm95")])
+	(funcall (symbol-function 'add-menu-button)
+		 options-menu
+		 ["Show Cross-References in Other Buffer"
+		  (setq ada-xref-other-buffer
+			(not ada-xref-other-buffer))
+		  :style toggle :selected ada-xref-other-buffer])
+	(funcall (symbol-function 'add-menu-button)
+		 options-menu
+		 ["Automatically Recompile for Cross-References"
+		  (setq ada-xref-create-ali (not ada-xref-create-ali))
+		  :style toggle :selected ada-xref-create-ali])
+	(funcall (symbol-function 'add-menu-button)
+		 options-menu
+		 ["Confirm Commands"
+		  (setq ada-xref-confirm-compile
+			(not ada-xref-confirm-compile))
+		  :style toggle :selected ada-xref-confirm-compile])
+	)
 ;; for Emacs
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Check]
+(let* ((menu         (lookup-key ada-mode-map [menu-bar Ada]))
-'("Check file" . ada-check-current) 'Customize)
+	   (edit-menu    (lookup-key ada-mode-map [menu-bar Ada Edit]))
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Compile]
+	   (help-menu    (lookup-key ada-mode-map [menu-bar Ada Help]))
-'("Compile file" . ada-compile-current) 'Check)
+	   (goto-menu    (lookup-key ada-mode-map [menu-bar Ada Goto]))
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Build]
+	   (options-menu (lookup-key ada-mode-map [menu-bar Ada Options])))
-'("Build" . ada-compile-application) 'Compile)
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Run]
+(define-key-after menu [Check] '("Check file" . ada-check-current)
-'("Run" . ada-run-application) 'Build)
+	'Customize)
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Debug]
+(define-key-after menu [Compile] '("Compile file" . ada-compile-current)
-'("Debug" . ada-gdb-application) 'Run)
+'Check)
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [rem]
+(define-key-after menu [Build]   '("Build" . ada-compile-application)
-'("--" . nil) 'Debug)
+	'Compile)
-(define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Project]
+(define-key-after menu [Run]     '("Run"   . ada-run-application) 'Build)
-(cons "Project" (easy-menu-create-menu
+(define-key-after menu [Debug]   '("Debug" . ada-gdb-application) 'Run)
-"Project"
+(define-key-after menu [rem]     '("--"    . nil) 'Debug)
-'(["Associate" ada-change-prj t]
+(define-key-after menu [Project]
-["Set Default" ada-set-default-project-file t]
+	(cons "Project"
-["List" ada-buffer-list t])))
+	      (funcall (symbol-function 'easy-menu-create-menu)
-'rem)
+		       "Project"
+		       '(["Associate..."   ada-change-prj t
-(let ((help-submenu (lookup-key ada-mode-map [menu-bar Ada Help]))
+			  :included (string= mode-name "Ada")]
-(goto-submenu (lookup-key ada-mode-map [menu-bar Ada Goto]))
+			 ["Set Default..." ada-set-default-project-file t]
-(edit-submenu (lookup-key ada-mode-map [menu-bar Ada Edit])))
+			 ["List"        ada-buffer-list t])))
+	'rem)
-(define-key help-submenu [Gnat_ug]
+(define-key help-menu [Gnat_ug]
 '("Gnat User Guide" . (lambda() (interactive) (info "gnat_ug"))))
-(define-key help-submenu [Gnat_rm]
+(define-key help-menu [Gnat_rm]
 '("Gnat Reference Manual" . (lambda() (interactive) (info "gnat_rm"))))
-(define-key help-submenu [Gcc]
+(define-key help-menu [Gcc]
 '("Gcc Documentation" . (lambda() (interactive) (info "gcc"))))
-(define-key help-submenu [gdb]
+(define-key help-menu [gdb]
-'("Ada Aware Gdb Documentation" .
+'("Gdb Documentation" . (lambda() (interactive) (info "gdb"))))
-	  (lambda() (interactive) (info "gdb"))))
+(define-key help-menu [gdb]
-(define-key goto-submenu [rem]    '("----" . nil))
+'("Ada95 Reference Manual" . (lambda() (interactive) (info "arm95"))))
-(define-key goto-submenu [Parent]
-	'("Goto Parent Unit" . ada-goto-parent))
+(define-key goto-menu [rem]    '("----" . nil))
-(define-key goto-submenu [References-any]
+(define-key goto-menu [Parent] '("Goto Parent Unit"
-'("Goto References to any entity" . ada-find-any-references))
+				       . ada-goto-parent))
-(define-key goto-submenu [References]
+(define-key goto-menu [References-any]
-'("List References" . ada-find-references))
+	'("Goto References to any entity" . ada-find-any-references))
-(define-key goto-submenu [Prev]
+(define-key goto-menu [References]
-'("Goto Previous Reference" . ada-xref-goto-previous-reference))
+	'("List References" . ada-find-references))
-(define-key goto-submenu [Decl-other]
+(define-key goto-menu [Prev]
-'("Goto Declaration Other Frame" . ada-goto-declaration-other-frame))
+	'("Goto Previous Reference" . ada-xref-goto-previous-reference))
-(define-key goto-submenu [Decl]
+(define-key goto-menu [Decl-other]
-'("Goto Declaration/Body" . ada-goto-declaration))
+	'("Goto Declaration Other Frame" . ada-goto-declaration-other-frame))
+(define-key goto-menu [Decl]
-(define-key edit-submenu [rem] '("----" . nil))
+	'("Goto Declaration/Body" . ada-goto-declaration))
-(define-key edit-submenu [Complete] '("Complete Identifier"
-. ada-complete-identifier))
+(define-key edit-menu [rem] '("----" . nil))
+(define-key edit-menu [Complete] '("Complete Identifier"
+					 . ada-complete-identifier))
+(define-key-after options-menu [xrefrecompile]
+	'(menu-item "Automatically Recompile for Cross-References"
+		    (lambda()(interactive)
+		      (setq ada-xref-create-ali (not ada-xref-create-ali)))
+		    :button (:toggle . ada-xref-create-ali)) t)
+(define-key-after options-menu [xrefconfirm]
+	'(menu-item "Confirm Commands"
+		   (lambda()(interactive)
+		     (setq ada-xref-confirm-compile
+			   (not ada-xref-confirm-compile)))
+		   :button (:toggle . ada-xref-confirm-compile)) t)
+(define-key-after options-menu [xrefother]
+	'(menu-item "Show Cross-References in Other Buffer"
+		   (lambda()(interactive)
+		     (setq ada-xref-other-buffer (not ada-xref-other-buffer)))
+		   :button (:toggle . ada-xref-other-buffer)) t)
 )
-))
+)
+)
 ;; ----- Utilities -------------------------------------------------
 (defun ada-require-project-file ()
 "If no project file is assigned to this buffer, load one."
-(if (not ( my-local-variable-if-set-p 'ada-prj-src-dir (current-buffer)))
+(if (not (my-local-variable-if-set-p 'ada-prj-prj-file (current-buffer)))
-(ada-parse-prj-file (ada-prj-find-prj-file))))
+(ada-reread-prj-file)))
-(defun my-local-variable-if-set-p (variable &optional buffer)
-"Returns t if VARIABLE is local in BUFFER and is non-nil."
-(and (local-variable-p variable buffer)
-(save-excursion
-(set-buffer buffer)
-(symbol-value variable))))
 (defun ada-xref-push-pos (filename position)
 "Push (FILENAME, POSITION) on the position ring for cross-references."
 (setq ada-xref-pos-ring (cons (list position filename) ada-xref-pos-ring))
 (if (> (length ada-xref-pos-ring) ada-xref-pos-ring-max)
 (setcdr (nthcdr (1- ada-xref-pos-ring-max) ada-xref-pos-ring) nil)))
 name)
 (defun ada-set-default-project-file (name)
 "Set the file whose name is NAME as the default project file."
 (interactive "fProject file:")
+;;  All the directories should use this file as the default from now on,
+;;  even if they were already associated with a file.
+(set 'ada-xref-default-prj-file nil)
 (set 'ada-prj-default-project-file name)
-(ada-reread-prj-file t)
+;; Make sure that all the buffers see the new project file, even if they
+;; are not Ada buffers (for instance if we want to display the current
+;; project file in the frame title).
+(setq-default ada-prj-prj-file name)
+(ada-reread-prj-file name)
 )
-(defun ada-replace-substring (cmd-string search-for replace-with)
+;; ------ Handling the project file -----------------------------
-"Replace all instances of SEARCH-FOR with REPLACE-WITH in CMD-STRING."
-(while (string-match search-for cmd-string)
-(setq cmd-string (replace-match replace-with t t cmd-string)))
-cmd-string)
-(defun ada-treat-cmd-string (cmd-string)
-"Replace meta-sequences like ${...} in CMD-STRING with the appropriate value.
-The current buffer must be the one where all local variable are defined (that
-is the ada source)"
-(if ( my-local-variable-if-set-p 'ada-prj-src-dir (current-buffer))
-(if  (string-match "\\(-[^-\$I]*I\\)\${src_dir}" cmd-string)
-(progn
-(let ((str-def (substring cmd-string (match-beginning 1)
-(match-end 1))))
-(setq cmd-string
-(ada-replace-substring cmd-string
-"\\(-[^-\$I]*I\\)\${src_dir}"
-(mapconcat
-(lambda (x) (concat str-def x))
-ada-prj-src-dir " ")))))))
-(if ( my-local-variable-if-set-p 'ada-prj-obj-dir (current-buffer))
-(if (string-match "\\(-[^-\$O]*O\\)\${obj_dir}" cmd-string)
-(progn
-(let ((str-def (substring cmd-string (match-beginning 1)
-(match-end 1))))
-(setq cmd-string
-(ada-replace-substring cmd-string
-"\\(-[^-\$O]*O\\)\${obj_dir}"
-(mapconcat
-(lambda (x) (concat str-def x))
-ada-prj-obj-dir
-" ")))))))
-(if ( my-local-variable-if-set-p 'ada-prj-remote-machine (current-buffer))
-(setq cmd-string
-(ada-replace-substring cmd-string "\${remote_machine}"
-ada-prj-remote-machine)))
-(if ( my-local-variable-if-set-p 'ada-prj-comp-opt (current-buffer))
-(setq cmd-string
-(ada-replace-substring cmd-string "\${comp_opt}"
-ada-prj-comp-opt)))
-(if ( my-local-variable-if-set-p 'ada-prj-bind-opt (current-buffer))
-(setq cmd-string
-(ada-replace-substring cmd-string "\${bind_opt}"
-ada-prj-bind-opt)))
-(if ( my-local-variable-if-set-p 'ada-prj-link-opt (current-buffer))
-(setq cmd-string
-(ada-replace-substring cmd-string "\${link_opt}"
-ada-prj-link-opt)))
-(if ( my-local-variable-if-set-p 'ada-prj-main (current-buffer))
-(setq cmd-string
-(ada-replace-substring cmd-string "\${main}"
-ada-prj-main)))
-(if ( my-local-variable-if-set-p 'ada-prj-cross-prefix (current-buffer))
-(setq cmd-string
-(ada-replace-substring cmd-string "\${cross_prefix}"
-ada-prj-cross-prefix)))
-cmd-string)
 (defun ada-prj-find-prj-file (&optional no-user-question)
 "Find the prj file associated with the current buffer.
-The rules are the following ones :
+If NO-USER-QUESTION is non-nil, use a default file if not project file was
-- If the buffer is already associated with a prj file, use this one
+found, and do not ask the user.
-- else if there's a default prj file for the same directory use it
+If the buffer is not an Ada buffer, associate it with the default project
-- else if a prj file with the same filename exists, use it
+file. If none is set, return nil."
-- else if there's only one prj file in the directory, use it
-- else if there are more than one prj file, ask the user
+(let (selected)
-- else if there is no prj file and NO-USER-QUESTION is nil, ask the user
-for the project file to use."
+;;  If we don't have an ada buffer, or the current buffer is not
-(let* ((current-file (buffer-file-name))
+;;  a real file (for instance an emerge buffer)
-(first-choice (concat
-(file-name-sans-extension current-file)
+(if (or (not (string= mode-name "Ada"))
-ada-project-file-extension))
+	    (not (buffer-file-name)))
-(dir          (file-name-directory current-file))
+	;;  1st case: not an Ada buffer
-	 ;; on Emacs 20.2, directory-files does not work if
+	(if (and ada-prj-default-project-file
-	 ;; parse-sexp-lookup-properties is set
+		 (not (string= ada-prj-default-project-file "")))
-	 (parse-sexp-lookup-properties nil)
+	    (set 'selected ada-prj-default-project-file))
-(prj-files    (directory-files
-dir t
+;;  2nd case: If the buffer already has a project file, use it
-(concat ".*" (regexp-quote ada-project-file-extension) "$")))
+(if (my-local-variable-if-set-p 'ada-prj-prj-file (current-buffer))
-(choice       nil)
+	  (set 'selected ada-prj-prj-file)
-(default      (assoc dir ada-xref-default-prj-file))
-)
+	(let* ((current-file (buffer-file-name))
+	       (first-choice (concat
-(cond
+			      (file-name-sans-extension current-file)
+			      ada-project-file-extension))
-((my-local-variable-if-set-p 'ada-prj-prj-file (current-buffer))
+	       (dir          (file-name-directory current-file))
-ada-prj-prj-file)
+	       ;; on Emacs 20.2, directory-files does not work if
-(default                       ;; directory default project file
+	       ;; parse-sexp-lookup-properties is set
-(cdr default))
+	       (parse-sexp-lookup-properties nil)
+	       (prj-files    (directory-files
-;; global default project file
+			      dir t
-((and ada-prj-default-project-file
+			      (concat ".*" (regexp-quote ada-project-file-extension) "$")))
-(not (string= ada-prj-default-project-file "")))
+	       (choice       nil)
-ada-prj-default-project-file)
+	       (default      (assoc dir ada-xref-default-prj-file)))
-((file-exists-p first-choice)
+	  (cond
-first-choice)
+	   ;;  3rd case: a project file is already associated with the directory
-((= (length prj-files) 1)
+	   (default
-(car prj-files))
+	     (set 'selected (cdr default)))
-((> (length prj-files) 1)
+	   ;;  4th case: the user has set a default project file for every file
-;; more than one possible prj file => ask the user
+	   ((and ada-prj-default-project-file
-(with-output-to-temp-buffer "*choice list*"
+		 (not (string= ada-prj-default-project-file "")))
-(princ "There are more than one possible project file. Which one should\n")
+	    (set 'selected ada-prj-default-project-file))
-(princ "I use ?\n\n")
-(princ "  no.   file name  \n")
+	   ;;  5th case: there is a project file with the same name as the Ada file,
-(princ "  ---   ------------------------\n")
+	   ;;  but not the same extension.
-(let ((counter 1))
+	   ((file-exists-p first-choice)
-(while (<= counter (length prj-files))
+	    (set 'selected first-choice))
-(princ (format "  %2d)    %s\n"
-counter
+	   ;;  6th case: only one project file was found in the current directory
-(nth (1- counter) prj-files)))
+	   ((= (length prj-files) 1)
-(setq counter (1+ counter))
+	    (set 'selected (car prj-files)))
-) ; end of while
-) ; end of let
+	   ;;  7th case: if there are multiple files, ask the user
-) ; end of with-output-to ...
+	   ((and (> (length prj-files) 1) (not no-user-question))
-(setq choice nil)
+	    (save-window-excursion
-(while (or
+	      (with-output-to-temp-buffer "*choice list*"
-(not choice)
+		(princ "There are more than one possible project file. Which one should\n")
-(not (integerp choice))
+		(princ "be used ?\n\n")
-(< choice 1)
+		(princ "  no.   file name  \n")
-(> choice (length prj-files)))
+		(princ "  ---   ------------------------\n")
-(setq choice (string-to-int
+		(let ((counter 1))
-(read-from-minibuffer "Enter No. of your choice: "
+		  (while (<= counter (length prj-files))
-))))
+		    (princ (format "  %2d)    %s\n"
-(nth (1- choice) prj-files))
+				   counter
+				   (nth (1- counter) prj-files)))
-((= (length prj-files) 0)
+		    (setq counter (1+ counter))
-;;  no project file found. Ask the user about it (the default value
+		    ))) ; end of with-output-to ...
-;;  is the last one the user entered.
+	      (setq choice nil)
-(if (or no-user-question (not ada-always-ask-project))
+	      (while (or
-nil
+		      (not choice)
-(setq ada-last-prj-file
+		      (not (integerp choice))
-(read-file-name "project file:" nil ada-last-prj-file))
+		      (< choice 1)
-(if (string= ada-last-prj-file "") nil ada-last-prj-file))
+		      (> choice (length prj-files)))
-)
+		(setq choice (string-to-int
-)))
+			      (read-from-minibuffer "Enter No. of your choice: "))))
+	      (set 'selected (nth (1- choice) prj-files))))
+	   ;; 8th case: no project file was found in the directory, ask a name to the
+	   ;; user, using as a default value the last one entered by the user
+	   ((= (length prj-files) 0)
+	    (unless (or no-user-question (not ada-always-ask-project))
+	      (setq ada-last-prj-file
+		    (read-file-name "project file:" nil ada-last-prj-file))
+	      (unless (string= ada-last-prj-file "")
+		(set 'selected ada-last-prj-file))))
+	   ))))
+selected
+))
 (defun ada-parse-prj-file (prj-file)
-"Reads and parses the project file PRJ-FILE.
+"Reads and parses the PRJ-FILE file if it was found.
-Does nothing if PRJ-FILE was not found.
+The current buffer should be the ada-file buffer."
-The current buffer should be the ada-file buffer"
+(if prj-file
+(let (project src_dir obj_dir casing
-(let ((tmp-src-dir  nil)
+(ada-buffer (current-buffer)))
-(tmp-obj-dir  nil)
+	(set 'prj-file (expand-file-name prj-file))
-(tmp-comp-opt nil)
-(tmp-bind-opt nil)
+	;;  Initialize the project with the default values
-(tmp-link-opt nil)
+	(ada-xref-set-default-prj-values 'project (current-buffer))
-(tmp-main     nil)
-(tmp-comp-cmd nil)
+	;;  Do not use find-file below, since we don't want to show this
-(tmp-make-cmd nil)
+	;;  buffer. If the file is open through speedbar, we can't use
-(tmp-run-cmd  nil)
+	;;  find-file anyway, since the speedbar frame is special and does not
-(tmp-debug-cmd nil)
+	;;  allow the selection of a file in it.
-(tmp-remote-machine nil)
-(tmp-cross-prefix nil)
+	(set-buffer (find-file-noselect prj-file))
-(tmp-cd-cmd   (if prj-file
-(concat "cd " (file-name-directory prj-file) " && ")
+	(widen)
-(concat "cd " (file-name-directory (buffer-file-name (current-buffer))) " && ")))
+	(goto-char (point-min))
-(ada-buffer (current-buffer))
-)
+	;;  Now overrides these values with the project file
-;; tries to find a project file in the current directory
+	(while (not (eobp))
-(if prj-file
+	  (if (looking-at "^\\([^=]+\\)=\\(.*\\)")
-(progn
+	      (cond
-(find-file prj-file)
+	       ((string= (match-string 1) "src_dir")
+		(add-to-list 'src_dir
-;; first look for the src_dir lines
+			     (file-name-as-directory (match-string 2))))
-(widen)
+	       ((string= (match-string 1) "obj_dir")
-(goto-char (point-min))
+		(add-to-list 'obj_dir
-(while
+			     (file-name-as-directory (match-string 2))))
-(re-search-forward "^src_dir=\\(.*\\)" nil t)
+	       ((string= (match-string 1) "casing")
-(progn
+		(set 'casing (cons (match-string 2) casing)))
-(setq tmp-src-dir (cons
+	       ((string= (match-string 1) "build_dir")
-(file-name-as-directory
+		(set 'project
-(match-string 1))
+		     (plist-put project 'build_dir
-tmp-src-dir
+				(file-name-as-directory (match-string 2)))))
-))))
+	       (t
-;; then for the obj_dir lines
+		(set 'project (plist-put project (intern (match-string 1))
-(goto-char (point-min))
+					 (match-string 2))))))
-(while (re-search-forward "^obj_dir=\\(.*\\)" nil t)
+	  (forward-line 1))
-(setq tmp-obj-dir (cons
-(file-name-as-directory
+	(if src_dir (set 'project (plist-put project 'src_dir
-(match-string 1))
+					     (reverse src_dir))))
-tmp-obj-dir
+	(if obj_dir (set 'project (plist-put project 'obj_dir
-)))
+					     (reverse obj_dir))))
+	(if casing  (set 'project (plist-put project 'casing  casing)))
-;; then for the options lines
-(goto-char (point-min))
+	;;  Memorize the newly read project file
-(if (re-search-forward "^comp_opt=\\(.*\\)" nil t)
+	(if (assoc prj-file ada-xref-project-files)
-(setq tmp-comp-opt (match-string 1)))
+	    (setcdr (assoc prj-file ada-xref-project-files) project)
-(goto-char (point-min))
+	  (add-to-list 'ada-xref-project-files (cons prj-file project)))
-(if (re-search-forward "^bind_opt=\\(.*\\)" nil t)
-(setq tmp-bind-opt (match-string 1)))
+	;; Sets up the compilation-search-path so that Emacs is able to
-(goto-char (point-min))
+	;; go to the source of the errors in a compilation buffer
-(if (re-search-forward "^link_opt=\\(.*\\)" nil t)
+	(setq compilation-search-path (ada-get-absolute-dir-list
-(setq tmp-link-opt (match-string 1)))
+				       (plist-get project 'src_dir)
-(goto-char (point-min))
+				       (plist-get project 'build_dir)))
-(if (re-search-forward "^main=\\(.*\\)" nil t)
-(setq tmp-main (match-string 1)))
+	;;  Associate each source directory in the project file with this file
-(goto-char (point-min))
+	(mapcar (lambda (x)
-(if (re-search-forward "^comp_cmd=\\(.*\\)" nil t)
+		  (if (not (assoc (expand-file-name x)
-(setq tmp-comp-cmd (match-string 1)))
+				  ada-xref-default-prj-file))
-(goto-char (point-min))
+		      (setq ada-xref-default-prj-file
-(if (re-search-forward "^remote_machine=\\(.*\\)" nil t)
+			    (cons (cons (expand-file-name x) prj-file)
-(setq tmp-remote-machine (match-string 1)))
+				  ada-xref-default-prj-file))))
-(goto-char (point-min))
+		compilation-search-path)
-(if (re-search-forward "^cross_prefix=\\(.*\\)" nil t)
-(setq tmp-cross-prefix (match-string 1)))
+	;; Add the directories to the search path for ff-find-other-file
-(goto-char (point-min))
+	;; Do not add the '/' or '\' at the end
-(if (re-search-forward "^make_cmd=\\(.*\\)" nil t)
+	(set (make-local-variable 'ff-search-directories)
-(setq tmp-make-cmd (match-string 1)))
+	     (append (mapcar 'directory-file-name compilation-search-path)
-(goto-char (point-min))
+		     ada-search-directories))
-(if (re-search-forward "^run_cmd=\\(.*\\)" nil t)
-(setq tmp-run-cmd (match-string 1)))
+	;; Kill the .ali buffer
-(goto-char (point-min))
+	(kill-buffer nil)
-(if (re-search-forward "^debug_cmd=\\(.*\\)" nil t)
+	(set-buffer ada-buffer)
-(setq tmp-debug-cmd (match-string 1)))
+	;;  Setup the project file for the current buffer
-;; kills the project file buffer, and go back to the ada buffer
+	(set (make-local-variable 'ada-prj-prj-file) prj-file)
-(kill-buffer nil)
-(set-buffer ada-buffer)
+	)
-))
-;; creates local variables (with default values if needed)
-(set (make-local-variable 'ada-prj-prj-file) prj-file)
-(set (make-local-variable 'ada-prj-src-dir)
-(if tmp-src-dir (reverse tmp-src-dir)  '("./")))
-(set (make-local-variable 'ada-prj-obj-dir)
-(if tmp-obj-dir (reverse tmp-obj-dir)  '("./")))
-(set (make-local-variable 'ada-prj-comp-opt)
-(if tmp-comp-opt tmp-comp-opt ""))
-(set (make-local-variable 'ada-prj-bind-opt)
-(if tmp-bind-opt tmp-bind-opt ""))
-(set (make-local-variable 'ada-prj-link-opt)
-(if tmp-link-opt tmp-link-opt ""))
-(set (make-local-variable 'ada-prj-cross-prefix)
-(if tmp-cross-prefix
-(if (or (string= tmp-cross-prefix "")
-(= (aref tmp-cross-prefix (1- (length tmp-cross-prefix))) ?-))
-tmp-cross-prefix
-(concat tmp-cross-prefix "-"))
-""))
-(set (make-local-variable 'ada-prj-main)
-(if tmp-main tmp-main
-(substring (buffer-file-name) 0 -4)))
-(set (make-local-variable 'ada-prj-remote-machine)
-(ada-treat-cmd-string
-(if tmp-remote-machine tmp-remote-machine "")))
-(set (make-local-variable 'ada-prj-comp-cmd)
-(ada-treat-cmd-string
-(if tmp-comp-cmd tmp-comp-cmd
-(concat tmp-cd-cmd ada-prj-default-comp-cmd))))
-(set (make-local-variable 'ada-prj-make-cmd)
-(ada-treat-cmd-string
-(if tmp-make-cmd tmp-make-cmd
-(concat tmp-cd-cmd ada-prj-default-make-cmd))))
-(set (make-local-variable 'ada-prj-run-cmd)
-(ada-treat-cmd-string
-(if tmp-run-cmd tmp-run-cmd
-(if is-windows "${main}.exe" "${main}"))))
-(set (make-local-variable 'ada-prj-debug-cmd)
-(ada-treat-cmd-string
-(if tmp-debug-cmd tmp-debug-cmd
-(if is-windows
-"${cross_prefix}gdb ${main}.exe"
-"${cross_prefix}gdb ${main}"))))
-;; Add each directory in src_dir to the default prj list
-(if prj-file
-(mapcar (lambda (x)
-(if (not (assoc (expand-file-name x)
-ada-xref-default-prj-file))
-(setq ada-xref-default-prj-file
-(cons (cons (expand-file-name x)
-prj-file)
-ada-xref-default-prj-file))))
-ada-prj-src-dir))
-;; Add the directories to the search path for ff-find-other-file
-;; Do not add the '/' or '\' at the end
-(set (make-local-variable 'ff-search-directories)
-(append (mapcar 'directory-file-name ada-prj-src-dir)
-ada-search-directories))
-;; Sets up the compilation-search-path so that Emacs is able to
-;; go to the source of the errors in a compilation buffer
-(setq compilation-search-path ada-prj-src-dir)
 ))
 (defun ada-find-references (&optional pos)
 "Find all references to the entity under POS.
 Calls gnatfind to find the references."
 (interactive "")
 (unless pos
 (set 'pos (point)))
 (ada-require-project-file)
 (let* ((identlist (ada-read-identifier pos))
-(alifile (ada-get-ali-file-name (ada-file-of identlist))))
+(alifile (ada-get-ali-file-name (ada-file-of identlist)))
+	 (process-environment (ada-set-environment)))
 (set-buffer (get-file-buffer (ada-file-of identlist)))
 ;;  if the file is more recent than the executable
 (if (or (buffer-modified-p (current-buffer))
 ;; make sure we are using an Ada file
 (if (not (string= mode-name "Ada"))
 (error "You must be in ada-mode to use this function"))
-;; create the local variable if necessay
+(set (make-local-variable 'ada-prj-prj-file) filename)
-(if (not ( my-local-variable-if-set-p 'ada-prj-prj-file (current-buffer)))
+(ada-parse-prj-file filename)
-(make-local-variable 'ada-prj-prj-file))
-;; ask the user for the new file name
-(setq ada-prj-prj-file filename)
-;; force Emacs to reread the prj file next-time
-(ada-reread-prj-file)
 )
 (defun ada-change-default-prj (filename)
 "Set FILENAME to be the default project file for the current directory."
 (interactive "ffile name:")
 (if (assoc dir ada-xref-default-prj-file)
 	(setcdr (assoc dir ada-xref-default-prj-file) prj)
 (add-to-list 'ada-xref-default-prj-file (list dir prj)))
 ;; Reparse the project file
-(ada-parse-prj-file ada-prj-default-project-file)))
+(ada-parse-prj-file filename)))
 ;; ----- Identlist manipulation -------------------------------------------
 ;; An identlist is a vector that is used internally to reference an identifier
 ;; To facilitate its use, we provide the following macros
 ;; ----- Identifier Completion --------------------------------------------
 (defun ada-complete-identifier (pos)
 "Tries to complete the identifier around POS.
-The feature is only available if the files where not compiled using the -gnatx
+The feature is only available if the files where compiled not using the -gnatx
 option."
 (interactive "d")
 (ada-require-project-file)
-;; Initialize function-local variablesand jump to the .ali buffer
+;; Initialize function-local variables and jump to the .ali buffer
 ;; Note that for regexp search is case insensitive too
 (let* ((curbuf (current-buffer))
 (identlist (ada-read-identifier pos))
 (sofar (concat "^[0-9]+[a-zA-Z][0-9]+[ *]\\("
 (regexp-quote (ada-name-of identlist))
 "[a-zA-Z0-9_]*\\)"))
 (completed nil)
-(symalist nil)
+(symalist nil))
-(insertpos nil))
+;; Open the .ali file
-;; we are already in the .ali buffer
+(set-buffer (ada-get-ali-buffer (buffer-file-name)))
 (goto-char (point-max))
 ;; build an alist of possible completions
 (while (re-search-backward sofar nil t)
 (setq symalist (cons (cons (match-string 1) nil) symalist)))
 (ada-require-project-file)
 (push-mark pos)
 (ada-xref-push-pos (buffer-file-name) pos)
 (ada-find-in-ali (ada-read-identifier pos) t))
-(defun ada-compile (command)
+(defun ada-remote (command)
-"Start COMMAND on the machine specified in the project file."
+"Return the remote version of COMMAND, or COMMAND if remote_machine is nil."
-(if (and (my-local-variable-if-set-p 'ada-prj-remote-machine (current-buffer))
+(let ((machine (ada-xref-get-project-field 'remote_machine)))
-(not (string= ada-prj-remote-machine "")))
+(if (or (not machine) (string= machine ""))
-(set 'command
+	command
-(concat "rsh " ada-prj-remote-machine " '"
+(format "%s %s '(%s)'"
-command "'")))
+	      remote-shell-program
-(compile command))
+	      machine
+	      command))))
-(defun ada-compile-application ()
-"Compiles the application, using the command found in the project file."
+(defun ada-get-absolute-dir (dir root-dir)
+"Returns the absolute directory corresponding to DIR.
+If DIR is a relative directory, the value of ROOT-DIR is added in front."
+(if (= (string-to-char dir) ?/)
+dir
+(concat root-dir dir)))
+(defun ada-get-absolute-dir-list (dir-list root-dir)
+"Returns the list of absolute directories found in dir-list.
+If a directory is a relative directory, the value of ROOT-DIR is added in
+front."
+(mapcar (lambda (x) (ada-get-absolute-dir x root-dir)) dir-list))
+(defun ada-set-environment ()
+"Return the new value for process-environment.
+It modifies the source path and object path with the values found in the
+project file."
+(let ((include   (getenv "ADA_INCLUDE_PATH"))
+	(objects   (getenv "ADA_OBJECTS_PATH"))
+	(build-dir (ada-xref-get-project-field 'build_dir)))
+(if include
+	(set 'include (concat include path-separator)))
+(if objects
+	(set 'objects (concat objects path-separator)))
+(cons
+(concat "ADA_INCLUDE_PATH="
+	     include
+	     (mapconcat (lambda(x) (ada-get-absolute-dir x build-dir))
+			(ada-xref-get-project-field 'src_dir)
+			path-separator))
+(cons
+(concat "ADA_OBJECTS_PATH="
+	      objects
+	      (mapconcat (lambda(x) (ada-get-absolute-dir x build-dir))
+			 (ada-xref-get-project-field 'obj_dir)
+			 path-separator))
+process-environment))))
+(defun ada-compile-application (&optional arg)
+"Compiles the application, using the command found in the project file.
+If ARG is not nil, ask for user confirmation."
+(interactive "P")
+(ada-require-project-file)
+(let ((cmd (ada-xref-get-project-field 'make_cmd))
+	(process-environment (ada-set-environment))
+	(compilation-scroll-output t))
+(set 'compilation-search-path
+	 (ada-get-absolute-dir-list (ada-xref-get-project-field 'src_dir)
+				    (ada-xref-get-project-field 'build_dir)))
+;;  If no project file was found, ask the user
+(unless cmd
+(setq cmd "" arg t))
+(compile (ada-remote
+	      (if (or ada-xref-confirm-compile arg)
+		  (read-from-minibuffer "enter command to compile: " cmd)
+		cmd)))
+))
+(defun ada-compile-current (&optional arg prj-field)
+"Recompile the current file.
+If ARG is not nil, ask for user confirmation of the command.
+PRJ-FIELD is the name of the field to use in the project file to get the
+command, and should be either comp_cmd (default) or check_cmd."
+(interactive "P")
+(ada-require-project-file)
+(let* ((field (if prj-field prj-field 'comp_cmd))
+	 (cmd (ada-xref-get-project-field field))
+	 (process-environment (ada-set-environment))
+	 (compilation-scroll-output t))
+(set 'compilation-search-path
+	 (ada-get-absolute-dir-list (ada-xref-get-project-field 'src_dir)
+				    (ada-xref-get-project-field 'build_dir)))
+;;  If no project file was found, ask the user
+(if cmd
+	(set 'cmd (concat cmd " " (ada-convert-file-name (buffer-file-name))))
+(setq cmd "" arg t))
+(compile (ada-remote
+	      (if (or ada-xref-confirm-compile arg)
+		  (read-from-minibuffer "enter command to compile: " cmd)
+		cmd)))))
+(defun ada-check-current (&optional arg)
+"Recompile the current file.
+If ARG is not nil, ask for user confirmation of the command."
+(interactive "P")
+(ada-compile-current arg 'check_cmd))
+(defun ada-run-application (&optional arg)
+"Run the application.
+if ARG is not-nil, asks for user confirmation."
 (interactive)
 (ada-require-project-file)
-;; prompt for command to execute
+(let ((machine (ada-xref-get-project-field 'cross_prefix)))
-(ada-compile
+(if (and machine (not (string= machine "")))
-(if ada-xref-confirm-compile
+(error "This feature is not supported yet for cross environments")))
-(read-from-minibuffer "enter command to compile: "
-ada-prj-make-cmd)
+(let ((command (ada-xref-get-project-field 'run_cmd)))
-ada-prj-make-cmd))
-)
+;;  Guess the command if it wasn't specified
+(if (or (not command) (string= command ""))
-(defun ada-compile-current ()
+(set 'command (file-name-sans-extension (buffer-name))))
-"Recompile the current file."
-(interactive)
+;; Ask for the arguments to the command if required
-(ada-require-project-file)
+(if (or ada-xref-confirm-compile arg)
+	(set 'command (read-from-minibuffer "Enter command to execute: " command)))
-;; prompt for command to execute
-(ada-compile
+;; Modify the command to run remotely
-(if ada-xref-confirm-compile
+(setq command (ada-remote command))
-(read-from-minibuffer "enter command to compile: "
-(concat
-ada-prj-comp-cmd " " (ada-convert-file-name (buffer-file-name))))
-(concat ada-prj-comp-cmd " " (ada-convert-file-name (buffer-file-name)))))
-)
-(defun ada-check-current ()
-"Recompile the current file."
-(interactive)
-(ada-require-project-file)
-;; prompt for command to execute
-(let ((command (concat ada-prj-comp-cmd ada-check-switch
-(ada-convert-file-name (buffer-file-name)))))
-(compile
-(if ada-xref-confirm-compile
-(read-from-minibuffer "enter command to compile: " command)
-command))))
-(defun ada-run-application ()
-"Run the application."
-(interactive)
-(ada-require-project-file)
-(if (and (my-local-variable-if-set-p 'ada-prj-cross-prefix (current-buffer))
-(not (string= ada-prj-cross-prefix "")))
-(error "This feature is not supported yet for cross-compilation environments"))
-(let ((command ada-prj-run-cmd)
-(buffer  (current-buffer)))
-;; Search the command name if necessary
-(if (not (my-local-variable-if-set-p 'ada-prj-run-cmd (current-buffer)))
-(setq command (file-name-sans-extension (buffer-name)))
-)
-;; Ask for the arguments to the command
-(setq command
-(read-from-minibuffer "Enter command to execute: "
-command))
 ;; Run the command
 (save-excursion
 (set-buffer (get-buffer-create "*run*"))
-(goto-char (point-max))
+(set 'buffer-read-only nil)
+(erase-buffer)
+(goto-char (point-min))
 (insert "\nRunning " command "\n\n")
-(make-comint "run"
+(start-process "run" (current-buffer) shell-file-name "-c" command)
-(comint-arguments command 0 0)
-nil
-(comint-arguments command 1 nil))
 )
 (display-buffer "*run*")
 ;;  change to buffer *run* for interactive programs
 (other-window 1)
 (switch-to-buffer "*run*")
-)
+))
-)
+(defun ada-gdb-application (&optional arg)
-(defun ada-gdb-application ()
+"Start the debugger on the application.
-"Start the debugger on the application."
+If ARG is non-nil, ask the user to confirm the command."
-(interactive)
+(interactive "P")
-(require 'gud)
 (let ((buffer (current-buffer))
-gdb-buffer)
+gdb-buffer
+	cmd)
 (ada-require-project-file)
+(set 'cmd (ada-xref-get-project-field 'debug_cmd))
-(if (and (my-local-variable-if-set-p 'ada-prj-cross-prefix buffer)
+(let ((machine (ada-xref-get-project-field 'remote_machine)))
-(not (string= ada-prj-cross-prefix "")))
+(if (and machine (not (string= machine "")))
-(error "This feature is not supported yet for cross-compilation environments"))
+	  (error "This feature is not supported yet for remote environments")))
-;; If the command to use was given in the project file
+;;  If the command was not given in the project file, start a bare gdb
-(if (my-local-variable-if-set-p 'ada-prj-debug-cmd buffer)
+(if (not cmd)
-	(gdb ada-prj-debug-cmd)
+	(set 'cmd (concat ada-prj-default-debugger
-;; Else the user will have to enter the command himself
+			  " "
-(gdb "")
+			  (file-name-sans-extension (buffer-file-name)))))
-)
+(if (or arg ada-xref-confirm-compile)
+	(set 'cmd (read-from-minibuffer "enter command to debug: " cmd)))
-(set 'gdb-buffer (current-buffer))
+;;  Set the variable gud-last-last-frame so that glide-debug can find
+;;  the name of the Ada file, and thus of the project file if needed.
+(if ada-prj-prj-file
+	(set 'gud-last-last-frame (cons ada-prj-prj-file 1)))
+(if (and (string-match "jdb" (comint-arguments cmd 0 0))
+	     (boundp 'jdb))
+	(funcall (symbol-function 'jdb) cmd)
+(gdb cmd))
+(set 'gdb-buffer (symbol-value 'gud-comint-buffer))
 ;;  Switch back to the source buffer
 ;;  and Activate the debug part in the contextual menu
 (switch-to-buffer buffer)
 (if (functionp 'gud-make-debug-menu)
-	(gud-make-debug-menu))
+	(funcall (symbol-function 'gud-make-debug-menu)))
 ;;  Warning: on Emacs >= 20.3.8, same-window-regexps includes gud-*,
 ;;  so the following call to display buffer will select the
 ;;  buffer instead of displaying it in another window
 ;;  This is why the second argument to display-buffer is 't'
 (display-buffer gdb-buffer t)
 ))
-(defun ada-reread-prj-file (&optional for-all-buffer)
+(defun ada-reread-prj-file (&optional filename)
-"Forces Emacs to read the project file again.
+"Forces Emacs to read either FILENAME or the project file associated
-Otherwise, this file is only read once, and never read again
+with the current buffer.
-If FOR-ALL-BUFFER is non-nil, or the function was called with \C-u prefix,
+Otherwise, this file is only read once, and never read again.
-then do this for every opened buffer."
+Since the information in the project file is shared between all buffers, this
+automatically modifies the setup for all the Ada buffer that use this file."
 (interactive "P")
-(if for-all-buffer
+(if filename
+(ada-parse-prj-file filename)
-;; do this for every buffer
-(mapcar (lambda (x)
-(save-excursion
-(set-buffer x)
-		   ;; if we have the ada-mode and there is a real file
-		   ;; associated with the buffer
-(if (and (string= mode-name "Ada")
-			    (buffer-file-name))
-(progn
-(kill-local-variable 'ada-prj-src-dir)
-(kill-local-variable 'ada-prj-obj-dir)
-(ada-parse-prj-file (ada-prj-find-prj-file))))
-))
-(buffer-list))
-;; else do this just for the current buffer
-(kill-local-variable 'ada-prj-src-dir)
-(kill-local-variable 'ada-prj-obj-dir)
 (ada-parse-prj-file (ada-prj-find-prj-file)))
 )
 ;; ------ Private routines
 (defun ada-xref-current (file &optional ali-file-name)
 "Update the cross-references for FILE.
 This in fact recompiles FILE to create ALI-FILE-NAME."
 ;; kill old buffer
 (if (and ali-file-name
 (get-file-buffer ali-file-name))
 (kill-buffer (get-file-buffer ali-file-name)))
-;; prompt for command to execute
+;; read the project file
-(setq compile-command (concat ada-prj-comp-cmd
+(ada-require-project-file)
-" "
+(let* ((cmd (ada-xref-get-project-field 'comp_cmd))
-file))
+	 (process-environment (ada-set-environment))
-(compile
+	 (compilation-scroll-output t)
-(if ada-xref-confirm-compile
+	 (name      (ada-convert-file-name (buffer-file-name)))
-(read-from-minibuffer "enter command to execute gcc: "
+	 (body-name (ada-get-body-name name)))
-compile-command)
-compile-command))
+;; Always recompile the body when we can
-)
+(set 'body-name (or body-name name))
-(defun ada-first-non-nil (list)
+;; prompt for command to execute
-"Returns the first non-nil element of the LIST"
+(set 'cmd (concat cmd " " body-name))
-(cond
+(compile (ada-remote
-((not list) nil)
+	      (if ada-xref-confirm-compile
-((car list) (car list))
+		  (read-from-minibuffer "enter command to compile: " cmd)
-(t (ada-first-non-nil (cdr list)))
+		cmd)))))
-))
+(defun ada-find-file-in-dir (file dir-list)
+"Search for FILE in DIR-LIST."
+(let (found)
+(while (and (not found) dir-list)
+(set 'found (concat (file-name-as-directory (car dir-list))
+			  (file-name-nondirectory file)))
+(unless (file-exists-p found)
+	  (set 'found nil))
+(set 'dir-list (cdr dir-list)))
+found))
 (defun ada-find-ali-file-in-dir (file)
-"Search for FILE in obj_dir.
+"Find an .ali file in obj_dir. The current buffer must be the Ada file.
-The current buffer must be the Ada file."
+Adds build_dir in front of the search path to conform to gnatmake's behavior,
-(ada-first-non-nil
+and the standard runtime location at the end."
-(mapcar (lambda (x)
+(ada-find-file-in-dir file
-(if (file-exists-p (concat (file-name-directory x)
+			(append
-file))
-(concat (file-name-directory x) file)
+			 ;; Add ${build_dir} in front of the path
-nil))
+			 (list (ada-xref-get-project-field 'build_dir))
-ada-prj-obj-dir))
-)
+			 (ada-get-absolute-dir-list
+			  (ada-xref-get-project-field 'obj_dir)
+			  (ada-xref-get-project-field 'build_dir))
+			 ;; Add the standard runtime at the end
+			 ada-xref-runtime-library-ali-path)))
+(defun ada-find-src-file-in-dir (file)
+"Find a source file in src_dir. The current buffer must be the Ada file.
+Adds src_dir in front of the search path to conform to gnatmake's behavior,
+and the standard runtime location at the end."
+(ada-find-file-in-dir file
+			(append
+			 ;; Add ${build_dir} in front of the path
+			 (list (ada-xref-get-project-field 'build_dir))
+			 (ada-get-absolute-dir-list
+			  (ada-xref-get-project-field 'src_dir)
+			  (ada-xref-get-project-field 'build_dir))
+			 ;; Add the standard runtime at the end
+			 ada-xref-runtime-library-specs-path)))
 (defun ada-get-ali-file-name (file)
 "Create the ali file name for the ada-file FILE.
 The file is searched for in every directory shown in the obj_dir lines of
 the project file."
 (save-excursion
 (set-buffer (get-file-buffer file))
 (let ((short-ali-file-name
 (concat (file-name-sans-extension (file-name-nondirectory file))
 ".ali"))
-(ali-file-name ""))
+ali-file-name)
 ;; First step
 ;; we take the first possible completion
 (setq ali-file-name (ada-find-ali-file-in-dir short-ali-file-name))
 ;; If we have found the .ali file, but the source file was a spec
 ;; with a non-standard name, search the .ali file for the body if any,
 ;; since the xref information is more complete in that one
 (unless ali-file-name
-	  (if (not (string= (file-name-extension file) ".ads"))
+	  (if (not (string= (file-name-extension file) "ads"))
 	      (let ((is-spec nil)
 		    (specs ada-spec-suffixes)
 		    body-ali)
 		(while specs
 		  (if (string-match (concat (regexp-quote (car specs)) "$")
 "Create the complete file name (+directory) for FILE.
 The original file (where the user was) is ORIGINAL-FILE. Search in project
 file for possible paths."
 (save-excursion
-(set-buffer (get-file-buffer original-file))
+;; If the buffer for original-file, use it to get the values from the
+;; project file, otherwise load the file and its project file
+(let ((buffer (get-file-buffer original-file)))
+(if buffer
+	  (set-buffer buffer)
+	(find-file original-file)
+	(ada-require-project-file)))
 ;; we choose the first possible completion and we
 ;; return the absolute file name
-(let ((filename
+(let ((filename (ada-find-src-file-in-dir file)))
-(ada-first-non-nil (mapcar (lambda (x)
-(if (file-exists-p (concat (file-name-directory x)
-(file-name-nondirectory file)))
-(concat (file-name-directory x)
-(file-name-nondirectory file))
-nil))
-ada-prj-src-dir))))
 (if filename
 (expand-file-name filename)
 (error (concat
 (file-name-nondirectory file)
 " not found in src_dir. Please check your project file")))
 ;; as in "+", "-", ..
 (if (= (char-after) ?\")
 (forward-char 1))
 ;; if looking at an operator
-(if (looking-at ada-operator-re)
+;; This is only true if:
+;;   - the symbol is +, -, ...
+;;   - the symbol is made of letters, and not followed by _ or a letter
+(if (and (looking-at ada-operator-re)
+	     (or (not (= (char-syntax (char-after)) ?w))
+		 (not (or (= (char-syntax (char-after (match-end 0))) ?w)
+			  (= (char-after (match-end 0)) ?_)))))
 (progn
 (if (and (= (char-before) ?\")
 (= (char-after (+ (length (match-string 0)) (point))) ?\"))
 (forward-char -1))
-(set 'identifier (concat "\"" (match-string 0) "\"")))
+(set 'identifier (regexp-quote (concat "\"" (match-string 0) "\""))))
 (if (ada-in-string-p)
 (error "Inside string or character constant"))
 (if (looking-at (concat ada-keywords "[^a-zA-Z_]"))
 (error "No cross-reference available for reserved keyword"))
 (ada-set-file      identlist (buffer-file-name))
 identlist
 ))
 (defun ada-get-all-references (identlist)
-"Completes and returns the IDENTLIST with the information extracted
+"Completes and returns IDENTLIST with the information extracted
 from the ali file (definition file and places where it is referenced)."
 (let ((ali-buffer (ada-get-ali-buffer (ada-file-of identlist)))
 	declaration-found)
 (set-buffer ali-buffer)
 (let ((bound (save-excursion (re-search-forward "^X " nil t))))
 (set 'declaration-found
 	       (re-search-forward
 		(concat "^"    (ada-line-of identlist)
 			"."    (ada-column-of identlist)
-			"[ *]" (regexp-quote (ada-name-of identlist))
+			"[ *]" (ada-name-of identlist)
 			" \\(.*\\)$") bound t))
 	  (if declaration-found
 	      (ada-set-on-declaration identlist t))
 	  ))
 	    (beginning-of-line)
 	    ;; while we have a continuation line, go up one line
 	    (while (looking-at "^\\.")
 	      (previous-line 1))
 	    (unless (looking-at (concat "[0-9]+.[0-9]+[ *]"
-					(ada-name-of identlist) " "))
+					(ada-name-of identlist) "[ <]"))
 	      (set 'declaration-found nil))))
 ;; Still no success ! The ali file must be too old, and we need to
 ;; use a basic algorithm based on guesses. Note that this only happens
 ;; if the user does not want us to automatically recompile files
 ;; automatically
 (unless declaration-found
-	(unless (ada-xref-find-in-modified-ali identlist)
+	(if (ada-xref-find-in-modified-ali identlist)
+	    (set 'declaration-found t)
 	  ;; no more idea to find the declaration. Give up
 	  (progn
 	    (kill-buffer ali-buffer)
 	    (error (concat "No declaration of " (ada-name-of identlist)
 			   " found."))
 				  (regexp-quote (ada-name-of identlist)) " "))
 	      (line-ada "--")
 	      (col-ada  "--")
 	      (line-ali 0)
 	      (len 0)
-	      (choice 0))
+	      (choice 0)
+	      (ali-buffer (current-buffer)))
 (goto-char (point-max))
 (while (re-search-backward my-regexp nil t)
 (save-excursion
 (set 'line-ali (count-lines (point-min) (point)))
 (not (integerp choice))
 (< choice 1)
 (> choice len))
 (setq choice (string-to-int
 (read-from-minibuffer "Enter No. of your choice: "))))
+	    (set-buffer ali-buffer)
 (goto-line (car (nth (1- choice) declist)))
 ))))))
 (defun ada-find-in-ali (identlist &optional other-frame)
 		    (re-search-forward "^D \\([a-zA-Z0-9_.-]+\\)" nil t
 				       (string-to-number file-number))
 		    (set 'file (match-string 1))
 		    )
 		;; Else get the nearest file
-		(re-search-backward "^X [0-9]+ \\([a-zA-Z0-9_.-]+\\)" nil t)
+		(set 'file (ada-declare-file-of identlist))
-		(set 'file (match-string 1))
 		)
 	      )
 	  (error "No body found"))
 ;; Else we were not on the declaration, find the place for it
 (find-file file)
 )
 ;; If the new buffer is not already associated with a project file, do it
 (unless (my-local-variable-if-set-p 'ada-prj-prj-file (current-buffer))
-(progn
+(set (make-local-variable 'ada-prj-prj-file) prj-file))
-(make-local-variable 'ada-prj-prj-file)
-(set 'ada-prj-prj-file prj-file)))
 ;; move the cursor to the correct position
 (push-mark)
 (goto-line line)
 (move-to-column column)
 (point))))
 (kill-buffer krunch-buf)))
 adaname
 )
 (defun ada-make-body-gnatstub ()
 "Create an Ada package body in the current buffer.
 This function uses the `gnatstub' program to create the body.
 This function typically is to be hooked into `ff-file-created-hooks'."
 (interactive)
 (defun ada-xref-initialize ()
 "Function called by ada-mode-hook to initialize the ada-xref.el package.
 For instance, it creates the gnat-specific menus, set some hooks for
 find-file...."
-(ada-add-ada-menu)
 (make-local-hook 'ff-file-created-hooks)
 (setq ff-file-created-hooks 'ada-make-body-gnatstub)
 ;; Read the project file and update the search path
 ;; before looking for the other file
 ;; ----- Add to ada-mode-hook ---------------------------------------------
 ;;  Set the keymap once and for all, so that the keys set by the user in his
 ;;  config file are not overwritten every time we open a new file.
+(ada-add-ada-menu)
 (ada-add-keymap)
 (add-hook 'ada-mode-hook 'ada-xref-initialize)
+;;  Use ddd as the default debugger if it was found
+(if (ada-find-file-in-dir "ddd" exec-path)
+(set 'ada-prj-default-debugger "ddd --tty -fullname -toolbar"))
+;;  Initializes the cross references to the runtime library
+(ada-initialize-runtime-library)
+;;  Add these standard directories to the search path
+(set 'ada-search-directories
+(append (mapcar 'directory-file-name ada-xref-runtime-library-specs-path)
+	     ada-search-directories))
+;;  Make sure that the files are always associated with a project file. Since
+;;  the project file has some fields that are used for the editor (like the
+;;  casing exceptions), it has to be read before the user edits a file).
+(add-hook 'ada-mode-hook
+	  (lambda()
+	    (let ((file (ada-prj-find-prj-file t)))
+	      (if file (ada-reread-prj-file file)))))
 (provide 'ada-xref)
 ;;; ada-xref.el ends here

Mercurial > emacs

comparison lisp/progmodes/ada-xref.el @ 30408:e3e2c9051c5f