* lisp/ada-prj.el (ada-prj-initialize-values): Fix use of deleted

  ada-xref-set-default-prj-values.
  (ada-prj-display-page): Ditto.

* list/ada-xref.el (ada-gnatstub-opts): Fix doc string.
  (ada-make-filename-from-adaname): Fix free variable.

2 files changed, 4 insertions, 5 deletions

diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index 9f1aa36cee3..f70906bae0d 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -104,7 +104,7 @@ If no project file is found, return the default values."
 
     ;;  Set default values (except for the file name if this was given
     ;;  in the buffer
-    (ada-xref-set-default-prj-values symbol ada-buffer)
+    (set symbol (ada-default-prj-properties))
     (if (and filename (not (string= filename "")))
         (set symbol (plist-put (eval symbol) 'filename filename)))
     ))
@@ -463,8 +463,7 @@ connect to the target when working with cross-environments" t)
   (widget-insert "______________________________________________________________________\n\n       ")
   (widget-create 'push-button
                  :notify (lambda (&rest ignore)
-                           (ada-xref-set-default-prj-values
-                            'ada-prj-current-values ada-prj-ada-buffer)
+                           (setq ada-prj-current-values (ada-default-prj-properties))
                            (ada-prj-display-page 1))
                  "Reset to Default Values")
   (widget-insert "         ")
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 7470f8ca6b4..d38795658cd 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -157,7 +157,7 @@ this string is not empty.  It is set whenever a project file is found."
   :type '(file :must-match t) :group 'ada)
 
 (defcustom ada-gnatstub-opts "-q -I${src_dir}"
-  "*List of the options to pass to `gnatsub' to generate the body of a package.
+  "*Options to pass to `gnatsub' to generate the body of a package.
 This has the same syntax as in the project file (with variable substitution)."
   :type 'string :group 'ada)
 
@@ -2276,7 +2276,7 @@ Return the position of the declaration in the buffer, or nil if not found."
   "Determine the filename in which ADANAME is found.
 This is a GNAT specific function that uses gnatkrunch."
   (let ((krunch-buf (generate-new-buffer "*gkrunch*"))
-        (cross-prefix (plist-get plist 'cross_prefix)))
+        (cross-prefix (plist-get (cdr (ada-xref-current-project)) 'cross_prefix)))
     (save-excursion
       (set-buffer krunch-buf)
       ;; send adaname to external process `gnatkr'.