cleanup (#793)

Author: matsl

ChangeLog

@@ -5,6 +5,13 @@
 
 2025-10-04  Mats Lidell  <matsl@gnu.org>
 
+* hyrolo.el (custom):
+  hyperbole.el (custom): Drop require of custom due to preload.
+
+* hproperty.el: Use declare-function for hattr:get, ibut:map and ebut:map
+    so require of hbut can be removed to cut dependency cycle.
+    (custom): Drop not required dependencies.
+
 * Makefile (run-bash): Run bash in docker container for use with the
     docker target.
 

hproperty.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    21-Aug-92
-;; Last-Mod:      7-Sep-25 at 16:03:02 by Bob Weiner
+;; Last-Mod:      5-Oct-25 at 16:41:34 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -19,18 +19,17 @@
 
 ;;; Code:
 
-;; (when noninteractive
-;;   ;; Don't load this library
-;;   (with-current-buffer " *load*"
-;;     (goto-char (point-max))))
+(eval-when-compile
+  (require 'subr-x))                    ; For when-let* in Emacs 28.2
+(require 'hload-path)
 
 ;;; ************************************************************************
-;;; Other required Elisp libraries
+;;; Public declarations
 ;;; ************************************************************************
 
-(require 'hload-path)
-(require 'custom) ;; For defface.
-(require 'hbut)
+(declare-function hattr:get "hbut")
+(declare-function ibut:map "hbut")
+(declare-function ebut:map "hbut")
 
 ;; Comment out next line out because this triggers loads of kview
 ;; which loads klink which contains a defib whose priority should be set

hvar.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     1-Oct-91 at 14:00:24
-;; Last-Mod:     29-May-24 at 01:08:47 by Bob Weiner
+;; Last-Mod:     29-Sep-25 at 20:23:23 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -112,16 +112,8 @@ existed before the change was made."
 					  buf))
 			  (buffer-list)))))
 
-;;; ************************************************************************
-;;; Private variables
-;;; ************************************************************************
-
-(defvar var::append-list nil
-  "List of (var-symbol . appended-list) elements saved from this Emacs session.")
-
 (provide 'hvar)
 
-
 ;; `hsettings' and `hvar' have a cyclic dependency; require this after providing 'hvar
 ;; to avoid an infinite loop.
 (require 'hsettings)

hyperbole.el

@@ -9,7 +9,7 @@
 ;; Maintainer:   Robert Weiner <rsw@gnu.org>
 ;; Maintainers:  Robert Weiner <rsw@gnu.org>, Mats Lidell <matsl@gnu.org>
 ;; Created:      06-Oct-92 at 11:52:51
-;; Last-Mod:     20-Jun-25 at 00:21:49 by Bob Weiner
+;; Last-Mod:      2-Oct-25 at 14:28:52 by Mats Lidell
 ;; Released:     10-Mar-24
 ;; Version:      9.0.2pre
 ;; Keywords:     comm, convenience, files, frames, hypermedia, languages, mail, matching, mouse, multimedia, outlines, tools, wp
@@ -83,9 +83,6 @@
 (defconst hyperbole-loading t
   "Temporary constant available for testing while Hyperbole is loading.")
 
-;; Ensure defgroup and defcustom are defined for use throughout Hyperbole.
-(require 'custom)
-
 (defgroup hyperbole nil
   "Hyperbole customizations category."
   :group 'applications)

hyrolo.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     7-Jun-89 at 22:08:29
-;; Last-Mod:     10-Aug-25 at 23:00:16 by Mats Lidell
+;; Last-Mod:      2-Oct-25 at 14:26:58 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -32,7 +32,6 @@
 ;;; Other required Elisp libraries
 ;;; ************************************************************************
 
-(require 'custom)   ;; For `defface'
 (require 'hversion)
 (require 'hmail)
 (require 'hsys-consult)