[elpa] externals/gnat-compiler 8ca2e5bcd2 2/2: Finish merge

[Stephen Leake]

branch: externals/gnat-compiler
commit 8ca2e5bcd244c8d191035c3c4e011e31e534738e
Merge: 2273ebad7f 7496273a2e
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Finish merge
---
 ELPA.make        |  6 +-----
 gnat-alire.el    |  2 +-
 gnat-compiler.el | 16 ++++++++--------
 gnat-xref.el     |  4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ELPA.make b/ELPA.make
index b0953e309f..157c9a0371 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -6,23 +6,19 @@ all : byte-compile autoloads
 
 ifeq ($(shell uname),Linux)
 EMACS_EXE ?= emacs
-WISI ?= /Projects/org.emacs.wisi
 
 else ifeq ($(shell uname),Darwin)
 EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs"
-WISI ?= /Projects/org.emacs.wisi
 
 else
 # windows
-# specify uniscribe to workaround weird Windows harfbuzz bug
-EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe
+EMACS_EXE ?= emacs
 WISI ?= c:/Projects/elpa/packages/wisi
 
 endif
 
 BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn 
t)(batch-byte-compile))"
 byte-compile : byte-compile-clean
-       $(MAKE) -C $(WISI)/build byte-compile autoloads
        $(EMACS_EXE) -Q -batch -L . -L $(WISI) --eval $(BYTE_COMPILE) *.el
 
 byte-compile-clean :
diff --git a/gnat-alire.el b/gnat-alire.el
index 7dc8090c54..b946cce19e 100644
--- a/gnat-alire.el
+++ b/gnat-alire.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; See https://alire.ada.dev/
 
diff --git a/gnat-compiler.el b/gnat-compiler.el
index c46ce65e15..3aa0d3fb06 100644
--- a/gnat-compiler.el
+++ b/gnat-compiler.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (require 'cl-lib)
 (require 'wisi-prj)
@@ -715,10 +715,10 @@ Prompt user if more than one."
     (wisi-case-adjust-identifier)
     (delete-char 1)))
 
-(defun gnat-context-clause ()
-  (if (fboundp 'ada-fix-context-clause);; in ada-mode
-      (ada-fix-context-clause)
-    (user-error "ada-fix-context-clause not defined; can't find context 
clause")))
+(defun gnat-context-clause-region ()
+  (if (fboundp 'ada-context-clause-region);; in ada-mode
+      (ada-context-clause-region)
+    (user-error "ada-context-clause-region not defined; can't find context 
clause")))
 
 (defun gnat-extend-with-clause (partial-parent-name child-name)
   "Assuming point is in a selected name, just before CHILD-NAME, add or
@@ -732,10 +732,10 @@ extend a with_clause to include CHILD-NAME."
     (skip-syntax-backward "w_.")
     (search-forward-regexp gnat-name-regexp parent-name-end t)
     (let ((parent-name (match-string 0))
-         (context-clause (gnat-context-clause)))
+         (context-clause (gnat-context-clause-region)))
       (goto-char (car context-clause))
       (if (search-forward-regexp (concat "^with " parent-name ";") (cdr 
context-clause) t)
-         ;; found exisiting 'with' for parent; extend it
+         ;; found existing 'with' for parent; extend it
          (progn
            (forward-char -1) ; skip back over semicolon
            (insert "." child-name))
@@ -1456,7 +1456,7 @@ server executable not found; otherwise signal user-error."
    ;;   foo.c:2: `TRUE' undeclared here (not in a function)
    ;;   foo.c:2 : `TRUE' undeclared here (not in a function)
    ;;
-   ;; we can't handle secondary errors here, because a regexp can't 
distinquish "message" from "filename"
+   ;; we can't handle secondary errors here, because a regexp can't 
distinguish "message" from "filename"
    "^\\(\\(.:\\)?[^ :\n]+\\):\\([0-9]+\\)\\s-?:?\\([0-9]+\\)?" 1 3 4))
 
 (eval-after-load 'ada-mode '(add-hook 'ada-mode-hook #'gnatprep-setup))
diff --git a/gnat-xref.el b/gnat-xref.el
index bba675caac..2a9e9a33f8 100644
--- a/gnat-xref.el
+++ b/gnat-xref.el
@@ -3,7 +3,7 @@
 ;; These tools are all Ada-specific; see gpr-query for multi-language
 ;; GNAT cross-reference tools.
 ;;
-;; GNAT is provided by AdaCore; see http://libre.adacore.com/
+;; GNAT is provided by AdaCore; see https://libre.adacore.com/
 ;;
 ;;; Copyright (C) 2012 - 2022  Free Software Foundation, Inc.
 ;;
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (require 'compile)
 (require 'gnat-compiler)