[elpa] externals-release/ada-mode 146cb4ecba 2/2: Resolve conflicts, finish propagate

[Stephen Leake]

branch: externals-release/ada-mode
commit 146cb4ecba073a8669bf90cd198f895d56fc60d1
Merge: cdf3e4640e fa98735095
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Resolve conflicts, finish propagate
---
 Alire.make    |  2 +-
 ELPA.make     |  2 +-
 NEWS          |  5 +++++
 README        |  2 +-
 ada-mode.el   | 57 +++++----------------------------------------------------
 ada-mode.texi | 10 +---------
 build.sh      |  5 +----
 install.sh    |  2 ++
 8 files changed, 17 insertions(+), 68 deletions(-)

diff --git a/Alire.make b/Alire.make
index 0e6188580b..f7e9a89a24 100644
--- a/Alire.make
+++ b/Alire.make
@@ -7,5 +7,5 @@ include 
$(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
 include $(WISITOKEN_ALIRE_PREFIX)/build/wisitoken_alire_rules.make
 
 # Local Variables:
-# eval: (load-file "prj-eglot.el")
+# eval: (load-file "prj.el")
 # End:
diff --git a/ELPA.make b/ELPA.make
index ccf76b7f89..698f751345 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -1,4 +1,4 @@
-# For compiling ada-mode Ada code in elpa worktree
+# For compiling ada-mode in elpa worktree
 
 #export Standard_Common_Build := Debug
 
diff --git a/NEWS b/NEWS
index c02f897c7f..c5830f9018 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send ada-mode bug reports to bug-gnu-emacs@gnu.org, with
 'ada-mode' in the subject. If possible, use M-x report-emacs-bug.
 
 
+Ada Mode 8.0.4
+16 Jan 2023
+
+** Misc bug fixes.
+
 Ada Mode 8.0.3
 6 Jan 2023
 
diff --git a/README b/README
index d2334b7c74..7db7121651 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 8.0.3
+Emacs Ada mode version 8.0.4
 
 Ada mode provides auto-casing, fontification, navigation, and
 indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index 5317a9e242..a67b46aa1b 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,8 +6,8 @@
 ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages
 ;;  ada
-;; Version: 8.0.3
-;; package-requires: ((uniquify-files "1.0.1") (wisi "4.2.0") (gnat-compiler 
"1.0.1") (emacs "25.3"))
+;; Version: 8.0.4
+;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler 
"1.0.1") (emacs "25.3"))
 ;; url: https://www.nongnu.org/ada-mode/
 ;;
 ;; This file is part of GNU Emacs.
@@ -117,7 +117,7 @@
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
-  (let ((version-string "8.0.3"))
+  (let ((version-string "8.0.4"))
     (if (called-interactively-p 'interactive)
        (message version-string)
       version-string)))
@@ -164,7 +164,7 @@ nil, only the file name."
 
     ;; global-map has C-x ` 'next-error
     (define-key map [return]    'wisi-case-adjust-interactive)
-    (define-key map "\C-c`"     'ada-show-secondary-error)
+    (define-key map "\C-c`"     'gnat-show-secondary-error)
     (define-key map "\C-c;"      (lambda () (error "use M-; instead"))) ; 
comment-dwim
     (define-key map "\C-c\M-`"          'wisi-fix-compiler-error)
     (define-key map "\C-c\C-a"          'ada-align)
@@ -215,7 +215,7 @@ nil, only the file name."
     )
     ("Build"
      ["Next compilation error/xref"  next-error              t]
-     ["Show secondary error"         ada-show-secondary-error t]
+     ["Show secondary error"         gnat-show-secondary-error t]
      ["Fix compilation error"        wisi-fix-compiler-error  t]
      ["Show last parse error"        wisi-show-parse-error    t]
      ["Check syntax"                 ada-build-check         t]
@@ -879,53 +879,6 @@ the file name."
     (speedbar-add-supported-extension body))
   )
 
-(defun ada-show-secondary-error ()
-  "Show the next secondary file reference in the compilation buffer.
-A secondary file reference is defined by text having text
-property `gnat-secondary-error'.  These can be set by
-compiler-specific compilation filters."
-  (interactive)
-
-  ;; preserving the current window works only if the frame
-  ;; doesn't change, at least on Windows.
-  (let ((start-buffer (current-buffer))
-       pos item file)
-    (when (eq major-mode 'compilation-mode)
-      (setq next-error-last-buffer (current-buffer)))
-    ;; We use `pop-to-buffer', not `set-buffer', so point is correct
-    ;; for the current window showing next-error-last-buffer, and
-    ;; moving point in that window works. But that might eat an
-    ;; `other-frame-window-mode' prefix, which the user means to apply
-    ;; to ’ada-goto-source’ below; disable that temporarily.
-    (let ((display-buffer-overriding-action nil))
-      (pop-to-buffer next-error-last-buffer nil t)
-      (setq pos (next-single-property-change (point) 'gnat-secondary-error))
-      (unless pos
-       ;; probably at end of compilation-buffer, in new compile
-       (goto-char (point-min))
-       (setq pos (next-single-property-change (point) 'gnat-secondary-error)))
-
-      (when pos
-       (setq item (get-text-property pos 'gnat-secondary-error))
-       ;; file-relative-name handles absolute Windows paths from
-       ;; g++. Do this in compilation buffer to get correct
-       ;; default-directory.
-       (setq file (file-relative-name (nth 0 item)))
-
-       ;; Set point in compilation buffer past this secondary error, so
-       ;; user can easily go to the next one.
-       (goto-char (next-single-property-change (1+ pos) 
'gnat-secondary-error)))
-
-      (pop-to-buffer start-buffer nil t);; for windowing history
-      )
-    (when item
-      (wisi-goto-source
-       file
-       (nth 1 item); line
-       (nth 2 item); column
-       ))
-    ))
-
 (defun ada-goto-declaration-start-1 (include-type)
   "Subroutine of `ada-goto-declaration-start'."
   (let ((start (point))
diff --git a/ada-mode.texi b/ada-mode.texi
index c53dbc795b..84335451ed 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -23,21 +23,13 @@ developing GNU and promoting software freedom.''
 * Ada mode: (ada-mode).         Emacs mode for editing and navigating Ada code.
 @end direntry
 
-@titlepage
-@sp 10
-@title Ada Mode Version 8.0.3
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
 @contents
 
 @ifnottex
 @node Top, Overview, (dir), (dir)
 @top Top
 
-Ada Mode Version 8.0.3
+Ada Mode Version 8.0
 @end ifnottex
 
 @menu
diff --git a/build.sh b/build.sh
index c8e6944435..08b8ce7094 100755
--- a/build.sh
+++ b/build.sh
@@ -12,11 +12,8 @@ if type alr; then
     echo "building ada-mode executables via Alire"
 
     # alr get --build builds dependencies with release, but top with 
development.
-    alr get emacs_ada_mode~8.0.2
+    alr get emacs_ada_mode~8.0.3
     cd emacs_ada_mode_*; alr build --release
-
-    # WORKAROUND: this should be in alire_rules.make
-    mv ada_annex_p_lr1_parse_table.txt bin
     
 elif type gprbuild; then
     echo "building ada-mode executables via gnat compiler"
diff --git a/install.sh b/install.sh
index 0ff97429d2..8645b48b4a 100755
--- a/install.sh
+++ b/install.sh
@@ -16,6 +16,8 @@ echo "installing ada-mode executables to" $PREFIX/bin
 
 # No need for gprinstall; we only need the executable 
 
+mkdir -p $PREFIX/bin
+
 if type alr; then
     cp emacs_ada_mode*/bin/* $PREFIX/bin