From 0a9c02f250c42aed45ea7083647b51a10d5efae4 Mon Sep 17 00:00:00 2001
From: Stephen Leake <stephen_leake@stephe-leake.org>
Date: Fri, 14 Mar 2014 17:57:27 -0500
Subject: [PATCH] * packages/ada-mode: version 5.1.1: fix wisi packaging bug,
 add -a in gnat-find

* packages/wisi/wisi.el: bump version to reflect change.
---
 packages/ada-mode/README           |  2 +-
 packages/ada-mode/ada-gnat-xref.el | 13 ++++++++-----
 packages/ada-mode/ada-mode.el      |  6 +++---
 packages/wisi/wisi.el              |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/ada-mode/README b/packages/ada-mode/README
index 7e9e126ed..f4bfcb725 100755
--- a/packages/ada-mode/README
+++ b/packages/ada-mode/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 5.1.0
+Emacs Ada mode version 5.1.1
 
 Ada mode requires Emacs 24.2 or greater
 
diff --git a/packages/ada-mode/ada-gnat-xref.el b/packages/ada-mode/ada-gnat-xref.el
index 4f0d7168c..7144540ce 100755
--- a/packages/ada-mode/ada-gnat-xref.el
+++ b/packages/ada-mode/ada-gnat-xref.el
@@ -6,7 +6,7 @@
 ;;
 ;; GNAT is provided by AdaCore; see http://libre.adacore.com/
 ;;
-;;; Copyright (C) 2012, 2013  Free Software Foundation, Inc.
+;;; Copyright (C) 2012 - 2014  Free Software Foundation, Inc.
 ;;
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
@@ -53,7 +53,9 @@
     )
 
   (let* ((arg (format "%s:%s:%d:%d" identifier file line col))
-	 (switches (when (ada-prj-get 'gpr_ext) (concat "--ext=" (ada-prj-get 'gpr_ext))))
+	 (switches (concat
+                    "-a"
+                    (when (ada-prj-get 'gpr_ext) (concat "--ext=" (ada-prj-get 'gpr_ext)))))
 	 status
 	 (result nil))
     (with-current-buffer (gnat-run-buffer)
@@ -96,13 +98,14 @@
   "For `ada-xref-parents-function', using 'gnat find', which is Ada-specific."
 
   (let* ((arg (format "%s:%s:%d:%d" identifier file line col))
-	 (switches (concat
+	 (switches (list
+                    "-a"
 		    "-d"
 		    (when (ada-prj-get 'gpr_ext) (concat "--ext=" (ada-prj-get 'gpr_ext)))
 		    ))
 	 (result nil))
     (with-current-buffer (gnat-run-buffer)
-      (gnat-run-gnat "find" (list switches arg))
+      (gnat-run-gnat "find" (append switches (list arg)))
 
       (goto-char (point-min))
       (forward-line 2); skip GPR_PROJECT_PATH, 'gnat find'
@@ -149,7 +152,7 @@
   ;; is asynchronous, and automatically runs the compilation error
   ;; filter.
 
-  (let* ((cmd (format "gnat find -r %s:%s:%d:%d" identifier file line col)))
+  (let* ((cmd (format "gnat find -a -r %s:%s:%d:%d" identifier file line col)))
 
     (with-current-buffer (gnat-run-buffer); for default-directory
       (let ((compilation-environment (ada-prj-get 'proc_env))
diff --git a/packages/ada-mode/ada-mode.el b/packages/ada-mode/ada-mode.el
index 7a2c6b9d5..3e7b8cb23 100755
--- a/packages/ada-mode/ada-mode.el
+++ b/packages/ada-mode/ada-mode.el
@@ -5,8 +5,8 @@
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Keywords FIXME: languages, ada ELPA broken for multiple keywords
-;; Version: 5.1.0
-;; package-requires: ((wisi "1.0.1") (cl-lib "0.4") (emacs "24.2"))
+;; Version: 5.1.1
+;; package-requires: ((wisi "1.0.2") (cl-lib "0.4") (emacs "24.2"))
 ;; url: http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html
 ;;
 ;; (Gnu ELPA requires single digits between dots in versions)
@@ -167,7 +167,7 @@
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
-  (let ((version-string "5.1.0"))
+  (let ((version-string "5.1.1"))
     ;; must match:
     ;; ada-mode.texi
     ;; README
diff --git a/packages/wisi/wisi.el b/packages/wisi/wisi.el
index a9cd0b695..62302b77b 100755
--- a/packages/wisi/wisi.el
+++ b/packages/wisi/wisi.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012, 2013, 2014  Free Software Foundation, Inc.
 ;;
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
-;; Version: 1.0.1
+;; Version: 1.0.2
 ;; package-requires: ((cl-lib "0.4") (emacs "24.2"))
 ;; URL: http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html
 ;;
-- 
2.39.2