[elpa] externals/wisi 8684f9d: * NEWS: Release 3.1.7

[Stephen Leake]

branch: externals/wisi
commit 8684f9dce8df3359ecfa8f550bfe555672fab3c2
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    * NEWS: Release 3.1.7
    
    * README: Bump version.
    * wisi.el:
    * wisi.texi:
    
    * wisi-prj.el (wisi-goto-spec/body): Actually fix xref change.
---
 NEWS        | 10 ++++++++++
 README      |  2 +-
 wisi-prj.el | 18 ++++++++++++------
 wisi.el     |  2 +-
 wisi.texi   |  4 ++--
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 9264d77..1cab4ee 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,16 @@ Please send wisi bug reports to bug-gnu-emacs@gnu.org, with
 'wisi' in the subject. If possible, use M-x report-emacs-bug.
 
 
+* wisi 3.1.7
+21 Nov 2021
+
+** Correct last fix (sigh).
+
+* wisi 3.1.6
+21 Nov 2021
+
+** Adapt to change in xref.el xref-file-location.
+
 * wisi 3.1.5
 30 Jul 2021
 
diff --git a/README b/README
index a63d701..6486309 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs wisi package 3.1.6
+Emacs wisi package 3.1.7
 
 The wisi package provides utilities for using generalized
 error-correcting LR parsers (in external processes) to do indentation,
diff --git a/wisi-prj.el b/wisi-prj.el
index 8bcb030..78a241b 100644
--- a/wisi-prj.el
+++ b/wisi-prj.el
@@ -336,15 +336,21 @@ If no symbol at point, or with prefix arg, prompt for 
symbol, goto spec."
       ;; from xref-backend-identifier-at-point; desired location is 'other'
       (let ((item (wisi-xref-item identifier prj)))
        (condition-case err
-           ;; WORKAROUND: xref 1.3.2 xref-location changed from defclass to 
cl-defstruct
-           (with-suppressed-warnings (nil) ;; "unknown slot"
+           ;; WORKAROUND: xref 1.3.2 in Emacs 28 xref-location
+           ;; changed from defclass to cl-defstruct. If drop emacs
+           ;; 26, use 'with-suppressed-warnings'.
+           (with-no-warnings ;; "unknown slot"
              (let ((summary (if (functionp 'xref-item-summary) 
(xref-item-summary item) (oref item :summary)))
                    (location (if (functionp 'xref-item-location) 
(xref-item-location item) (oref item :location)))
                    (eieio-skip-typecheck t)) ;; 'location' may have line, 
column nil
-               (let ((file (if (functionp 'xref-location-file) 
(xref-location-file location) (oref location :file)))
-                     (line (if (functionp 'xref-location-line) 
(xref-location-line location) (oref location :line)))
-                     (column (if (functionp 'xref-location-column)
-                                 (xref-location-column location)
+               (let ((file (if (functionp 'xref-file-location-file)
+                               (xref-file-location-file location)
+                             (oref location :file)))
+                     (line (if (functionp 'xref-file-location-line)
+                               (xref-file-location-line location)
+                             (oref location :line)))
+                     (column (if (functionp 'xref-file-location-column)
+                                 (xref-file-location-column location)
                                (oref location :column))))
                  (let ((target
                         (wisi-xref-other
diff --git a/wisi.el b/wisi.el
index b595e6d..eebf2d6 100644
--- a/wisi.el
+++ b/wisi.el
@@ -7,7 +7,7 @@
 ;; Keywords: parser
 ;;  indentation
 ;;  navigation
-;; Version: 3.1.6
+;; Version: 3.1.7
 ;; package-requires: ((emacs "25.3") (seq "2.20"))
 ;; URL: http://stephe-leake.org/ada/wisitoken.html
 ;;
diff --git a/wisi.texi b/wisi.texi
index 1369ad8..390defb 100644
--- a/wisi.texi
+++ b/wisi.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 
 @titlepage
 @sp 10
-@title Wisi Version 3.1.6
+@title Wisi Version 3.1.7
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -37,7 +37,7 @@ developing GNU and promoting software freedom.''
 @node Top
 @top Top
 
-Wisi Version 3.1.6
+Wisi Version 3.1.7
 @end ifnottex
 
 @menu