[elpa] externals-release/wisi db272eca5c 2/2: merge from externals/wisi to externals-release/wisi

[Stephen Leake]

branch: externals-release/wisi
commit db272eca5c7cce620e19c1040cd97f79e0bd30b4
Merge: 52b2507fb3 ebe31c4c1f
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    merge from externals/wisi to externals-release/wisi
---
 NEWS                  |  5 +++++
 wisi-prj.el           | 17 ++++++++---------
 wisi-process-parse.el |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index de041e5bf2..e9b4614448 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ 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 4.2.3
+26 Jan 2023
+
+** Fix byte-compiler warnings reported by Emacs master.
+
 * wisi 4.2.2
 16 Jan 2023
 
diff --git a/wisi-prj.el b/wisi-prj.el
index 69ecc132a2..cb64fa656f 100644
--- a/wisi-prj.el
+++ b/wisi-prj.el
@@ -1,6 +1,6 @@
 ;;; wisi-prj.el --- project integration -*- lexical-binding:t -*-
 ;;
-;; Copyright (C) 2019 - 2022  Free Software Foundation, Inc.
+;; Copyright (C) 2019 - 2023  Free Software Foundation, Inc.
 ;;
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
 ;;
@@ -365,14 +365,13 @@ user arg limits completion to current file."
     ;; WORKAROUND: in emacs 28 xref-location changed from defclass to
     ;; cl-defstruct.
     (require 'eieio)
-    (with-suppressed-warnings ;; "unknown slot" in emacs 28
-       (progn
-         (defun xref-item-summary (item) (oref item summary))
-         (defun xref-item-location (item) (oref item location))
-         (defun xref-file-location-file (location) (oref location file))
-         (defun xref-file-location-line (location) (oref location line))
-         (defun xref-file-location-column (location) (oref location column))
-         ))))
+    (with-no-warnings ;; "unknown slot"
+      (defun xref-item-summary (item) (oref item summary))
+      (defun xref-item-location (item) (oref item location))
+      (defun xref-file-location-file (location) (oref location file))
+      (defun xref-file-location-line (location) (oref location line))
+      (defun xref-file-location-column (location) (oref location column))
+      )))
 
 (defun wisi-goto-spec/body (identifier)
   "Goto declaration or body for IDENTIFIER (default symbol at point).
diff --git a/wisi-process-parse.el b/wisi-process-parse.el
index 94019e01b1..210f19f81c 100644
--- a/wisi-process-parse.el
+++ b/wisi-process-parse.el
@@ -1129,7 +1129,7 @@ Source buffer is current."
   (funcall action)
   (condition-case _err
       (wisi-process-parse--handle-messages parser)
-    ('wisi-file_not_found
+    (wisi-file_not_found
      (message "parsing buffer ...")
      (wisi-process-parse--send-incremental-parse parser t) ;; creates parse 
context
      (wisi-process-parse--wait parser)
@@ -1205,7 +1205,7 @@ Source buffer is current."
     (wisi-process-parse--send-incremental-parse parser full)
     (condition-case _err
        (wisi-process-parse--handle-messages parser)
-      ('wisi-file_not_found
+      (wisi-file_not_found
        (message "parsing buffer ...")
        (wisi-process-parse--send-incremental-parse parser t)
        (wisi-process-parse--handle-messages parser)