[elpa] externals/hyperbole fa7bb66 2/2: Only try to load autoloads if available (#89)

[ELPA Syncer]

branch: externals/hyperbole
commit fa7bb66842e3f0376122cfbd0b67866d75707e80
Author: Mats Lidell <mats.lidell@lidells.se>
Commit: GitHub <noreply@github.com>

    Only try to load autoloads if available (#89)
---
 ChangeLog    |  5 +++++
 Makefile     |  2 +-
 hyperbole.el | 11 ++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dd5ba6..d01c903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2021-05-16  Mats Lidell  <matsl@gnu.org>
 
+* Makefile (version): Do version number check in a portable way.
+
+* hyperbole.el (hyperb:maybe-load-autoloads, hyperb:maybe-load-autoloads):
+    Only load autoloads if present.
+
 * hypb.el (hypb:function-copy): Remove XEmacs compatibility code for
     bytecode objects.
 
diff --git a/Makefile b/Makefile
index 968b070..fc9c434 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ clean:
 version: doc
        @ echo ""
        @ echo "Any fgrep output means the version number has not been updated 
in that file."
-       fgrep -L $(HYPB_VERSION) Makefile HY-ABOUT HY-NEWS README.md 
hversion.el hyperbole.el man/hyperbole.texi man/version.texi; [ $$? -eq 0 ] || 
exit 1
+       test 0 -eq $$(fgrep -L $(HYPB_VERSION) Makefile HY-ABOUT HY-NEWS 
README.md hversion.el hyperbole.el man/hyperbole.texi man/version.texi | wc -c) 
|| exit 1
        @ echo ""
 
 # Build the Info, HTML and Postscript versions of the user manual and 
README.md.html.
diff --git a/hyperbole.el b/hyperbole.el
index a0c0f5f..0a6b9f4 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -426,11 +426,6 @@ directory or directories specified."
     (setq generated-autoload-file output-file)
     (update-directory-autoloads dir)))
 
-;; Koutliner autoloads in the kotl/ subdirectory are generated by 'make pkg'.
-;; This next line ensures they are loaded by hyperbole-autoloads whenever
-;; the Hyperbole package is activated in an Emacs session.
-;;;###autoload (load "kotl/kotl-autoloads" nil 'nowarn)
-
 ;; Before the 6.0.1 release, Hyperbole used to patch the 
package-generate-autoloads
 ;; function to ensure that kotl/ subdirectories were autoloaded.  This
 ;; is no longer used but is left here temporarily for reference.
@@ -702,9 +697,11 @@ This is used only when running from git source and not a 
package release."
         (hypb-autoloads (expand-file-name "hyperbole-autoloads.el"))
         (kotl-autoloads (expand-file-name "kotl/kotl-autoloads.el")))
     (unless (featurep 'hyperbole-autoloads)
-      (load-file hypb-autoloads))
+      (when (file-readable-p hypb-autoloads)
+        (load-file hypb-autoloads)))
     (unless (featurep 'kotl-autoloads)
-      (load-file kotl-autoloads))))
+      (when (file-readable-p kotl-autoloads)
+        (load-file kotl-autoloads)))))
 
 ;; This call loads the rest of the Hyperbole system.
 (require 'hinit)