[elpa] externals/gnat-compiler 2273ebad7f 1/2: Misc fixes

[Stephen Leake]

branch: externals/gnat-compiler
commit 2273ebad7f31e149c3fa0b9a2c82707f398dad0c
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Misc fixes
    
    * gnat-alire.el (create-alire-project): Call wisi-compiler-parse-one
    as well.
    
    * gnat-compiler.el (gnat-find-als): Handle locate-file return nil.
---
 gnat-alire.el    | 3 ++-
 gnat-compiler.el | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnat-alire.el b/gnat-alire.el
index 489df1d450..7dc8090c54 100644
--- a/gnat-alire.el
+++ b/gnat-alire.el
@@ -117,7 +117,8 @@
     (setf (wisi-prj-xref project)
          (funcall (intern (format "create-%s-xref" (symbol-name xref-label)))))
 
-    (wisi-xref-parse-one (wisi-prj-xref project) project "gpr_file" 
abs-gpr-file)
+    (wisi-compiler-parse-one (wisi-prj-compiler project) project "gpr_file" 
abs-gpr-file)
+    (wisi-xref-parse-one     (wisi-prj-xref project)     project "gpr_file" 
abs-gpr-file)
 
     project))
 
diff --git a/gnat-compiler.el b/gnat-compiler.el
index cc0a004ce9..c46ce65e15 100644
--- a/gnat-compiler.el
+++ b/gnat-compiler.el
@@ -782,11 +782,10 @@ to AdaCore ada_language_server in `exec-path', then in a 
gnat
 installation found in `exec-path'.  If NO-ERROR, return nil if
 server executable not found; otherwise signal user-error."
   (if gnat-lsp-server-exec
-      (progn
-        (setq gnat-lsp-server-exec (locate-file gnat-lsp-server-exec exec-path 
exec-suffixes))
-        (if (and gnat-lsp-server-exec
-            (file-readable-p gnat-lsp-server-exec))
-           gnat-lsp-server-exec
+      (let ((tmp (locate-file gnat-lsp-server-exec exec-path exec-suffixes)))
+        (if (and tmp
+            (file-readable-p tmp))
+            (setq gnat-lsp-server-exec tmp)
          (user-error "gnat-lsp-server-exec '%s' not a readable file"
                      gnat-lsp-server-exec)))