[elpa] externals/hyperbole c085ed7099 39/47: Merge branch 'master' into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit c085ed7099936800e02ad86f1a7b7f30a29af7cb
Merge: a69d994d5a cbb15c43fe
Author: Robert Weiner <rsw@gnu.org>
Commit: GitHub <noreply@github.com>

    Merge branch 'master' into rsw
---
 ChangeLog           |  5 +++-
 Makefile            |  6 ++---
 hact.el             |  3 ++-
 hactypes.el         | 11 +++++----
 hargs.el            |  3 +--
 hbut.el             | 20 ++++++++++------
 hibtypes.el         | 27 ++++++++++++----------
 hload-path.el       |  7 +++---
 hui-mouse.el        |  6 +++--
 hui-select.el       |  6 ++---
 hversion.el         | 66 ++++++++++++++++++++++++++---------------------------
 hycontrol.el        | 10 ++++----
 hypb.el             |  2 +-
 hyperbole.el        |  4 +---
 hyrolo.el           | 35 +++++++++++++---------------
 set.el              |  8 +++----
 test/kcell-tests.el |  2 +-
 17 files changed, 115 insertions(+), 106 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cdef553643..69b41f4e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,10 @@
   hui.el (hui:ebut-link-directly, hui:ibut-link-directly): Add 
hmouse-pulse-line
     to highlight referent line linked to.
 
+2023-06-21  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (LOAD_EL): Use gnu make pattern substitution.
+
 2023-06-19  Bob Weiner  <rsw@gnu.org>
 
 * hactypes.el: (link-to-regexp-match): Replace 'find-file-noselect' with
@@ -320,7 +324,6 @@ name with 'name' and 'name-key'.
     pre-command hook: (eq major-mode 'kotl-mode).  Also, comment this test
     out since call should not be on the stack since this is a pre-command
     hook: (not (hyperb:stack-frame '(kcell-view:to-label-end))).
->>>>>>> rsw
 
 2023-05-27  Bob Weiner  <rsw@gnu.org>
 
diff --git a/Makefile b/Makefile
index 6d881daee6..85b1cded50 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     13-May-23 at 14:57:28 by Bob Weiner
+# Last-Mod:     24-Jun-23 at 00:31:35 by Mats Lidell
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -304,9 +304,9 @@ bin: src
        $(RM) *.elc kotl/*.elc
        $(EMACS_BATCH) -f batch-byte-compile $(EL_KOTL) $(EL_COMPILE)
 
-# Create -l "file.el" load-file command-line args for each Hyperbole .el file 
for use in
+# Create -l file.el load-file command-line args for each Hyperbole .el file 
for use in
 # eln native compile target below.
-LOAD_EL = $(shell echo "$(EL_KOTL) $(EL_COMPILE)" | sed - -e 's+ +" -l "./+g' 
-e 's+^+-l "+')"
+LOAD_EL = $(shell echo "$(EL_KOTL) $(EL_COMPILE)" | sed -e 's+^+./+' -e 's+ + 
-l ./+g' -e 's+^+-l +')
 
 load-hyperbole:
        $(EMACS_BATCH) \
diff --git a/hact.el b/hact.el
index 39e468c62d..3d215beaf0 100644
--- a/hact.el
+++ b/hact.el
@@ -1,4 +1,4 @@
-;;; hact.el --- GNU Hyperbole button action handling  -*- lexical-binding: t; 
-let*-
+;;; hact.el --- GNU Hyperbole button action handling  -*- lexical-binding: t; 
-*-
 ;;
 ;; Author:       Bob Weiner
 ;;
@@ -467,6 +467,7 @@ The type uses PARAMS to perform DEFAULT-ACTION (list of the 
rest of the
 arguments).  A call to this function is syntactically the same as for
 `defun',  but a doc string is required.
 Return symbol created when successful, else nil."
+  (declare (doc-string 3))
   `(progn
      (symtable:add ',type symtable:actypes)
      (htype:create ,type actypes ,doc ,params ,default-action nil)))
diff --git a/hactypes.el b/hactypes.el
index 112d903731..e5d6465a20 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -35,11 +35,11 @@
 (defact annot-bib (key)
   "Follow internal ref KEY within an annotated bibliography, delimiters=[]."
   (interactive "sReference key (no []): ")
-  (let ((key-regexp (concat "^[*]*[ \t]*\\[" (ebut:key-to-label key) "\\]"))
-       citation)
-    (if (save-excursion
-         (goto-char (point-max))
-         (setq citation (re-search-backward key-regexp nil t)))
+  (let* ((key-regexp (concat "^[*]*[ \t]*\\[" (ebut:key-to-label key) "\\]"))
+        (citation (save-excursion
+                    (goto-char (point-max))
+                    (re-search-backward key-regexp nil t))))
+    (if citation
        (progn (hpath:display-buffer (current-buffer))
               (goto-char citation)
               (beginning-of-line))
@@ -689,6 +689,7 @@ package to display search results."
 Uses `hpath:display-where' setting to control where the man page is displayed."
   (interactive "sManual topic: ")
   (require 'man)
+  (defvar Man-notify-method)
   (let ((Man-notify-method 'meek))
     (hpath:display-buffer (man topic))))
 
diff --git a/hargs.el b/hargs.el
index f0178a1225..4cee338726 100644
--- a/hargs.el
+++ b/hargs.el
@@ -276,8 +276,7 @@ Optional DEFAULT-PROMPT is used to describe default value."
 
 (defun hargs:set-string-to-complete ()
   "Store the current minibuffer contents into `hargs:string-to-complete'."
-  (save-window-excursion
-    (set-buffer (window-buffer (minibuffer-window)))
+  (with-current-buffer (window-buffer (minibuffer-window))
     (setq hargs:string-to-complete (minibuffer-contents-no-properties))
     (when (equal hargs:string-to-complete "")
       (setq hargs:string-to-complete nil))))
diff --git a/hbut.el b/hbut.el
index 9aa5f0c9ef..baa19c52bc 100644
--- a/hbut.el
+++ b/hbut.el
@@ -22,6 +22,7 @@
 (eval-and-compile (mapc #'require '(cl-lib elisp-mode help-mode hversion
                                    hmoccur hbmap htz hbdata hact
                                    hui-select view)))
+(require 'hmouse-drv) ;For `hui--ignore-action-key-depress-prev-point'.
 
 ;;; ************************************************************************
 ;;; Public declarations
@@ -218,6 +219,8 @@ Return nil if no matching button is found."
 (defalias 'ebut:key-src-fmt        #'hbut:key-src-fmt)
 (defalias 'ebut:key-to-label       #'hbut:key-to-label)
 
+(defvar hbut:max-len)
+
 (defun    ebut:label-p (&optional as-label start-delim end-delim pos-flag 
two-lines-flag)
   "Return key for the explicit button label that point is within, else nil.
 This is the normalized key form of the explicit button's label.
@@ -696,7 +699,7 @@ Return nil if no matching button is found."
 (defun    gbut:help (label)
   "Display help for Hyperbole global button with LABEL."
   (interactive (list (hargs:read-match "Report on global button labeled: "
-                                      (mapcar 'list (gbut:label-list))
+                                      (mapcar #'list (gbut:label-list))
                                       nil t nil 'hbut)))
   (let* ((lbl-key (hbut:label-to-key label))
         (but (hbut:get lbl-key nil (gbut:file))))
@@ -1525,7 +1528,7 @@ If a file, always return a full path if optional 
FULL-FLAG is non-nil."
               (expand-file-name file default-directory)
             file)))))
 
-(defalias 'hbut:summarize 'hbut:report)
+(defalias 'hbut:summarize #'hbut:report)
 
 (defun    hbut:to (lbl-key)
   "Find the nearest explicit button or labeled/named implicit button.
@@ -1896,6 +1899,9 @@ Store new button attributes in the symbol, 'hbut:current."
    [&optional ["&optional" arg &rest arg]]
    &optional ["&rest" arg])))
 
+(defvar ibut:label-start)
+(defvar ibut:label-end)
+
 (defun    ibut:delete (&optional but-sym)
   "Delete Hyperbole implicit button based on optional BUT-SYM.
 Default is the symbol hbut:current'.
@@ -2131,10 +2137,10 @@ positions at which the button label delimiter begins 
and ends."
     (error "(ibut:key): Argument is not a Hyperbole implicit button symbol, 
`%s'"
           ibut)))
 
-(defalias 'ibut:to-key-src   'hbut:to-key-src)
-(defalias 'ibut:key-to-label 'hbut:key-to-label)
-(defalias 'ibut:label-to-key 'hbut:label-to-key)
-(defalias 'map-ibut          'ibut:map)
+(defalias 'ibut:to-key-src   #'hbut:to-key-src)
+(defalias 'ibut:key-to-label #'hbut:key-to-label)
+(defalias 'ibut:label-to-key #'hbut:label-to-key)
+(defalias 'map-ibut          #'ibut:map)
 
 (defun    ibut:map (but-func &optional regexp-match include-delims)
   "Apply BUT-FUNC to the visible, named implicit buttons.
@@ -2482,7 +2488,7 @@ current."
            t))
        (t (error "(ibut:rename): Button '%s' not found in visible portion of 
buffer." old-lbl))))
 
-(defalias 'ibut:summarize 'hbut:report)
+(defalias 'ibut:summarize #'hbut:report)
 
 (defun    ibut:to (name-key)
   "Find the nearest implicit button with NAME-KEY (a name or name key).
diff --git a/hibtypes.el b/hibtypes.el
index d6c0f41702..7f581d1ddf 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -347,7 +347,7 @@ in all buffers."
            (and buffer-file-name
                 (boundp 'hyrolo-file-list)
                 (set:member (current-buffer)
-                            (mapcar 'get-file-buffer hyrolo-file-list)))))
+                            (mapcar #'get-file-buffer hyrolo-file-list)))))
     (let ((address (mail-address-at-p)))
       (when address
         (ibut:label-set address (match-beginning 1) (match-end 1))
@@ -364,16 +364,19 @@ in all buffers."
   "Follow an Org link in a non-Org mode buffer.
 This should be a very low priority so other Hyperbole types
 handle any links they recognize first."
-  (with-no-warnings
-    (when (and (eq hsys-org-enable-smart-keys t)
-              (not (funcall hsys-org-mode-function))
-              ;; Prevent infinite recursion if ever called via 
org-metareturn-hook
-              ;; from org-meta-return invocation.
-              (not (hyperb:stack-frame '(ibtypes::debugger-source 
org-meta-return))))
-      (let ((start-end (hsys-org-link-at-p)))
-       (when start-end
-          (hsys-org-set-ibut-label start-end)
-          (hact 'org-open-at-point-global))))))
+  (when (and (eq hsys-org-enable-smart-keys t)
+            (not (funcall hsys-org-mode-function))
+            ;; Prevent infinite recursion, e.g. if called via
+            ;; `org-metareturn-hook' from `org-meta-return' invocation.
+            (not hibtypes--within-org-link-outside-org-mode))
+    (require 'hsys-org)
+    (declare-function hsys-org-link-at-p      "hsys-org" ())
+    (declare-function hsys-org-set-ibut-label "hsys-org" (start-end))
+    (let* ((hibtypes--within-org-link-outside-org-mode t)
+           (start-end (hsys-org-link-at-p)))
+      (when start-end
+        (hsys-org-set-ibut-label start-end)
+        (hact #'org-open-at-point-global)))))
 
 ;;; ========================================================================
 ;;; Handles internal references within an annotated bibliography, delimiters=[]
@@ -1000,7 +1003,7 @@ in grep and shell buffers."
              ;; Grep matches, UNIX C compiler and Introl 68HC11 C
              ;; compiler errors, allowing for file names with
              ;; spaces followed by a null character rather than a :
-             (looking-at "\\([^\t\n\r\"'`]+\\) ?\\([1-9][0-9]*\\)[ :]")
+             (looking-at "\\([^\t\n\r\"'`]+\\)\0 ?\\([1-9][0-9]*\\)[ :]")
              ;; HP C compiler errors
              (looking-at "[a-zA-Z0-9]+: \"\\([^\t\n\r\",]+\\)\", line 
\\([0-9]+\\):")
              ;; BSO/Tasking 68HC08 C compiler errors
diff --git a/hload-path.el b/hload-path.el
index 3e9f4f0935..34ad0f8115 100644
--- a/hload-path.el
+++ b/hload-path.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    29-Jun-16 at 14:39:33
-;; Last-Mod:     21-May-23 at 03:55:58 by Bob Weiner
+;; Last-Mod:     25-Jun-23 at 09:58:19 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -25,14 +25,14 @@
 ;;; Public variables
 ;;; ************************************************************************
 
-;;;###autoload
+
 (defvar hyperb:microsoft-os-p
   (memq system-type '(ms-windows windows-nt ms-dos win32))
   "Non-nil iff Hyperbole is running under a Microsoft OS but not for WSL.
 WSL is Windows Subsystem for Linux.
 Use `hyperb:wsl-os-p' to test if running under WSL.")
 
-;;;###autoload
+
 (defvar hyperb:wsl-os-p
   (and (eq system-type 'gnu/linux) (executable-find "wsl.exe") t)
   "T iff Hyperbole is running under Microsoft Windows Subsystem for Linux 
(WSL).")
@@ -44,7 +44,6 @@ Use `hyperb:wsl-os-p' to test if running under WSL.")
 (defvar hyperb:dir (or (file-name-directory
                        (or (and (stringp load-file-name) load-file-name)
                            (locate-file "hmouse-tag.el" load-path)
-                           (hyperb:path-being-loaded)
                            ""))
                       (error
                        "(Hyperbole): Failed to set hyperb:dir.  Try setting it 
manually"))
diff --git a/hui-mouse.el b/hui-mouse.el
index 29e3a1d6b8..cf7aad628d 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    04-Feb-89
-;; Last-Mod:     17-Jun-23 at 21:14:33 by Bob Weiner
+;; Last-Mod:     25-Jun-23 at 16:36:39 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1433,7 +1433,9 @@ NO-RECURSE-FLAG non-nil prevents infinite recursions."
                               ;; Does nothing unless the dash Emacs Lisp
                               ;; library is available for the -flatten 
function.
                               (and (require 'dash nil t)
-                                   (assoc index-key (-flatten alist)))))))
+                                   (progn
+                                     (declare-function -flatten "ext:dash")
+                                     (assoc index-key (-flatten alist))))))))
       (when index-item
        (setq index-position (when (markerp (cdr index-item))
                               (marker-position (cdr index-item))))
diff --git a/hui-select.el b/hui-select.el
index d10e61df4b..4880e4626b 100644
--- a/hui-select.el
+++ b/hui-select.el
@@ -169,7 +169,7 @@ Use for language major modes."
     (Info-mode "[^ \t\n]")
     (outline-mode "[^*]")
     (text-mode  "[^ \t\n*]"))
-  "List of (major-mode . non-terminator-line-regexp) elements.
+  "List of (MAJOR-MODE . NON-TERMINATOR-LINE-REGEXP) elements.
 Used to avoid early dropoff when marking indented code.")
 
 (defvar hui-select-indent-end-regexp-alist
@@ -185,7 +185,7 @@ Used to avoid early dropoff when marking indented code.")
     (indented-text-mode "[ \t]*$")
     (Info-mode "[ \t]*$")
     (text-mode  "[ \t]*$"))
-  "List of (major-mode . terminator-line-regexp) elements.
+  "List of (MAJOR-MODE . TERMINATOR-LINE-REGEXP) elements.
 Used to include a final line when marking indented code.")
 
 (defcustom hui-select-char-p nil
@@ -472,7 +472,7 @@ displayed in the minibuffer."
 ;;;###autoload
 (defun hui-select-goto-matching-tag ()
   "Move point to start of the tag paired with closest tag point is at or 
precedes.
-Enabled in major modes in `hui-select-markup-modes.  Returns t if
+Enabled in major modes in `hui-select-markup-modes'.  Returns t if
 point is moved, else nil.  Signals an error if no tag is found
 following point or if the closing tag does not have a `>'
 terminator character."
diff --git a/hversion.el b/hversion.el
index 45f4390bd6..60d3f73a06 100644
--- a/hversion.el
+++ b/hversion.el
@@ -4,7 +4,7 @@
 ;; Maintainer:   Bob Weiner, Mats Lidell
 ;;
 ;; Orig-Date:     1-Jan-94
-;; Last-Mod:     27-May-23 at 12:17:40 by Bob Weiner
+;; Last-Mod:     25-Jun-23 at 11:59:46 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -28,7 +28,7 @@
 
 (defconst hyperb:version "8.0.1pre" "GNU Hyperbole revision number.")
 
-;;;###autoload
+
 (defvar hyperb:mouse-buttons
   (if (or (and hyperb:microsoft-os-p (not (memq window-system '(w32 w64 x))))
          (memq window-system '(ns dps)))
@@ -52,6 +52,33 @@ your specific mouse.")
 ;;; Support functions
 ;;; ************************************************************************
 
+(defun hyperb:path-being-loaded ()
+  "Return the full pathname used by the innermost `load' or `require' call.
+Removes any matches for `hyperb:automount-prefixes' before returning
+the pathname."
+  (let* ((frame (hyperb:stack-frame '(load require)))
+        (function (nth 1 frame))
+        file nosuffix)
+    (cond ((eq function 'load)
+          (setq file (nth 2 frame)
+                nosuffix (nth 5 frame)))
+         ((eq function 'require)
+          (setq file (or (nth 3 frame) (symbol-name (nth 2 frame))))))
+    (when (stringp file)
+      (setq nosuffix (or nosuffix
+                        (string-match
+                         "\\.\\(elc?\\|elc?\\.gz\\|elc?\\.Z\\)$"
+                         file))
+           file (substitute-in-file-name file)
+           file (locate-file file load-path
+                             (when (null nosuffix) '(".elc" ".el" ".el.gz" 
".el.Z"))
+                             ;; accept any existing file
+                             nil)
+           file (if (and (stringp file)
+                         (string-match hyperb:automount-prefixes file))
+                    (substring file (1- (match-end 0)))
+                  file)))))
+
 ;; Called in hyperbole.el.
 (defun hyperb:stack-frame (function-list &optional debug-flag)
   "Return the nearest Elisp stack frame that called a function from 
FUNCTION-LIST.
@@ -93,38 +120,11 @@ of stack frames (from innermost to outermost)."
          nil)
        (when debug-flag (nreverse frame-list)))))
 
-(defun hyperb:path-being-loaded ()
-  "Return the full pathname used by the innermost `load' or `require' call.
-Removes any matches for `hyperb:automount-prefixes' before returning
-the pathname."
-  (let* ((frame (hyperb:stack-frame '(load require)))
-        (function (nth 1 frame))
-        file nosuffix)
-    (cond ((eq function 'load)
-          (setq file (nth 2 frame)
-                nosuffix (nth 5 frame)))
-         ((eq function 'require)
-          (setq file (or (nth 3 frame) (symbol-name (nth 2 frame))))))
-    (when (stringp file)
-      (setq nosuffix (or nosuffix
-                        (string-match
-                         "\\.\\(elc?\\|elc?\\.gz\\|elc?\\.Z\\)$"
-                         file))
-           file (substitute-in-file-name file)
-           file (locate-file file load-path
-                             (when (null nosuffix) '(".elc" ".el" ".el.gz" 
".el.Z"))
-                             ;; accept any existing file
-                             nil)
-           file (if (and (stringp file)
-                         (string-match hyperb:automount-prefixes file))
-                    (substring file (1- (match-end 0)))
-                  file)))))
-
 (defun hyperb:window-sys-term (&optional frame)
   "Return first part of the term-type if running under a window system, else 
nil.
 Where a part in the term-type is delimited by a `-' or  an `_'."
   (unless frame (setq frame (selected-frame)))
-  (let* ((display-type (if (fboundp 'device-type) (device-type) window-system))
+  (let* ((display-type window-system)
         (term (cond ((or (memq display-type '(x gtk mswindows win32 w32 ns dps 
pm))
                          ;; May be a graphical client spawned from a
                          ;; dumb terminal Emacs, e.g. under X, so if
@@ -133,13 +133,13 @@ Where a part in the term-type is delimited by a `-' or  
an `_'."
                          (display-mouse-p))
                      ;; X11, macOS, NEXTSTEP (DPS), or OS/2 Presentation 
Manager (PM)
                      "emacs")
+                    ;; Keep NeXT as basis for 2-button mouse support
                     ((or (featurep 'eterm-fns)
                          (equal (getenv "TERM") "NeXT")
                          (equal (getenv "TERM") "eterm"))
                      ;; NEXTSTEP add-on support to Emacs
                      "next"))))
-    (set-frame-parameter frame 'hyperb:window-system
-                        (and term (setq term (substring term 0 (string-match 
"[-_]" term)))))
+    (set-frame-parameter frame 'hyperb:window-system term)
     term))
 
 (defun hyperb:window-system (&optional frame)
@@ -190,7 +190,7 @@ support is available."
             ;; Force execution of Info-mode-hook which adds the
             ;; Hyperbole man directory to Info-directory-list.
             (info)
-            (if (string-match "^(\\([^\)]+\\))\\(.*\\)" index-item)
+            (if (string-match "^(\\([^)]+\\))\\(.*\\)" index-item)
                 (let ((file (match-string-no-properties 1 index-item))
                       (item-name (match-string-no-properties 2 index-item)))
                   (if (and file (setq file (hpath:substitute-value file)))
diff --git a/hycontrol.el b/hycontrol.el
index 88139e0684..f164619014 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -359,7 +359,7 @@ The final predicate should always be t, for default values, 
typically of zero.")
 ;;;###autoload
 (eval-after-load "dired"     '(define-key dired-mode-map       "@" 
'hycontrol-windows-grid))
 
-;;;###autoload
+
 (defvar hycontrol-windows-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map t) ;; Disable self-inserting keys and prefix keys
@@ -428,11 +428,11 @@ The final predicate should always be t, for default 
values, typically of zero.")
 
     ;; Don't call these interactively because a prefix arg of 1 tries
     ;; to make one window 1 line tall.
-    (define-key map "\["    (lambda () (interactive) 
(split-window-vertically)))
-    (define-key map "\]"    (lambda () (interactive) 
(split-window-horizontally)))
+    (define-key map "["    (lambda () (interactive) (split-window-vertically)))
+    (define-key map "]"    (lambda () (interactive) 
(split-window-horizontally)))
 
-    (define-key map "\("    'hycontrol-save-frame-configuration)
-    (define-key map "\)"    'hycontrol-restore-frame-configuration)
+    (define-key map "("    'hycontrol-save-frame-configuration)
+    (define-key map ")"    'hycontrol-restore-frame-configuration)
 
     (define-key map "~"     (lambda () (interactive)
                              (unless (hycontrol-window-swap-buffers)
diff --git a/hypb.el b/hypb.el
index 45390d89be..b1050e7eda 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     6-Oct-91 at 03:42:38
-;; Last-Mod:     18-Jun-23 at 14:53:11 by Bob Weiner
+;; Last-Mod:     25-Jun-23 at 10:11:57 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
diff --git a/hyperbole.el b/hyperbole.el
index f270cfc165..fb1afed7b7 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -7,7 +7,7 @@
 ;; Author:           Bob Weiner
 ;; Maintainer:       Bob Weiner <rsw@gnu.org>, Mats Lidell <matsl@gnu.org>
 ;; Created:          06-Oct-92 at 11:52:51
-;; Last-mod:      7-Mar-23 at 22:10:54 by Bob Weiner
+;; Last-mod:     25-Jun-23 at 12:01:04 by Bob Weiner
 ;; Released:         03-Dec-22
 ;; Version:          8.0.1pre
 ;; Keywords:         comm, convenience, files, frames, hypermedia, languages, 
mail, matching, mouse, multimedia, outlines, tools, wp
@@ -154,9 +154,7 @@ Info documentation at \"(hyperbole)Top\".
 
 \\{hyperbole-mode-map}"
   :global t
-  :keymap 'hyperbole-mode-map
   :lighter hyperbole-mode-lighter
-  :require 'hyperbole
   (if hyperbole-mode
       (hyperbole--enable-mode)
     (hyperbole--disable-mode)))
diff --git a/hyrolo.el b/hyrolo.el
index 089a618ce6..211e270278 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -157,29 +157,26 @@ use."
 
 ;; '("~/.rolo.otl" "~/.rolo.org")
 
+(defun hyrolo--initialize-file-list ()
+  (delq nil
+        (list "~/.rolo.otl"
+              (if (and (boundp 'bbdb-file) (stringp bbdb-file)) bbdb-file)
+              (when (hyrolo-google-contacts-p) google-contacts-buffer-name))))
+
 ;;;###autoload
 (defun hyrolo-initialize-file-list (&optional force-init-flag)
   "Initialize the list of files used for HyRolo search if not already 
initialized."
+  (declare (obsolete nil "8.0.1"))
   (interactive)
   (when (or force-init-flag (not (boundp 'hyrolo-file-list)) (not 
hyrolo-file-list))
-    (let* ((gcontacts (when (hyrolo-google-contacts-p) 
google-contacts-buffer-name))
-          (ms "~/.rolo.otl")
-          (posix "~/.rolo.otl")
-          (list (delq nil (if (and (boundp 'bbdb-file) (stringp bbdb-file))
-                              (if hyperb:microsoft-os-p
-                                  (list ms bbdb-file gcontacts)
-                                (list  "~/.rolo.otl" bbdb-file gcontacts))
-                            (if hyperb:microsoft-os-p
-                                (list ms gcontacts)
-                              (list posix gcontacts))))))
-      (setq hyrolo-file-list list)
-      (when (called-interactively-p 'interactive)
-       (message "HyRolo Search List: %S" list))
-      list)))
+    (setq hyrolo-file-list (hyrolo--initialize-file-list))
+    (when (called-interactively-p 'interactive)
+      (message "HyRolo Search List: %S" hyrolo-file-list))
+    hyrolo-file-list))
 
 (define-obsolete-variable-alias 'rolo-file-list 'hyrolo-file-list "06.00")
-(defcustom hyrolo-file-list (hyrolo-initialize-file-list)
-  "*List of files containing rolo entries.
+(defcustom hyrolo-file-list (hyrolo--initialize-file-list)
+  "List of files containing rolo entries.
 The first file should be a user-specific rolo file, typically in the home
 directory.
 
@@ -925,8 +922,8 @@ With optional ARG, turn them on iff ARG is positive."
          (and (not (and arg (> (prefix-numeric-value arg) 0)))
               (boundp 'hyrolo-add-hook) (listp hyrolo-add-hook)
               (memq 'hyrolo-set-date hyrolo-add-hook)))
-      (progn (remove-hook 'hyrolo-add-hook 'hyrolo-set-date)
-            (remove-hook 'hyrolo-edit-hook 'hyrolo-set-date)
+      (progn (remove-hook 'hyrolo-add-hook #'hyrolo-set-date)
+            (remove-hook 'hyrolo-edit-hook #'hyrolo-set-date)
             (message "Rolo date stamps are now off."))
     (add-hook 'hyrolo-add-hook  #'hyrolo-set-date)
     (add-hook 'hyrolo-edit-hook #'hyrolo-set-date)
@@ -1000,7 +997,7 @@ of a string."
                      (hyrolo-grep name -1)
                    (hyrolo-grep (regexp-quote name) -1))))
     ;; Let user reformat the region just yanked.
-    (if (and (= found 1) (fboundp hyrolo-yank-reformat-function))
+    (if (= found 1)
        (funcall hyrolo-yank-reformat-function start (point)))
     found))
 
diff --git a/set.el b/set.el
index 954cd21774..a7dc4a893c 100644
--- a/set.el
+++ b/set.el
@@ -90,7 +90,7 @@ valid set.  With optional ARITY, return only subsets with 
ARITY
 members."
   (cond ((null arity) 
         (setq arity 0)
-        (cons nil (apply 'nconc (mapcar (lambda (_elt) (setq arity (1+ arity)) 
(set:combinations set arity))
+        (cons nil (apply #'nconc (mapcar (lambda (_elt) (setq arity (1+ 
arity)) (set:combinations set arity))
                                         set))))
        ((= arity 1) set)
        ((<= arity 0) '(nil))
@@ -120,7 +120,7 @@ for comparison."
               elements)
         (nreverse set)))))
 
-(defalias 'set:delete 'set:remove)
+(defalias 'set:delete #'set:remove)
 (defun set:difference (&rest sets)
   "Return difference of any number of SETS.
 Difference is the set of elements in the first set that are not in any of the
@@ -132,7 +132,7 @@ other sets.  Uses `set:equal-op' for comparison."
      (cdr sets))
     rtn-set))
 
-(defalias 'set:size 'length)
+(defalias 'set:size #'length)
 
 (defun set:empty (set)
   "Return t if SET is empty."
@@ -170,7 +170,7 @@ Uses `set:equal-op' for comparison."
                     (setq lst (cdr lst))))
         (null lst))))
 
-(defalias 'set:map 'mapcar)
+(defalias 'set:map #'mapcar)
 
 (defun set:members (list)
   "Return set of unique elements of LIST.
diff --git a/test/kcell-tests.el b/test/kcell-tests.el
index 0ec633a26c..3187be79e2 100644
--- a/test/kcell-tests.el
+++ b/test/kcell-tests.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(require 'kcell)
+(require 'kcell "kotl/kcell")
 (require 'kotl-mode)
 (require 'hy-test-helpers "test/hy-test-helpers")