[elpa] externals/hyperbole 0e56e9db54 5/6: Merge branch 'master' into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit 0e56e9db547a11ad167e3e86e0322215d2f38f92
Merge: 3a8bdcf0a3 a7527d1d30
Author: bw <rsw@gnu.org>
Commit: bw <rsw@gnu.org>

    Merge branch 'master' into rsw
---
 ChangeLog          |  6 ++++++
 Makefile           |  8 ++++----
 hbut.el            |  4 ++--
 hibtypes.el        |  4 ++--
 hywiki.el          |  2 +-
 man/hyperbole.texi | 10 +++-------
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8040bbc594..35cae96434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,12 @@
 * man/hyperbole.texi (Implicit Button Types): Add doc for 
'hywiki-existing-word',
    'hywiki-word' and 'hynote-file'.
 
+2024-08-24  Mats Lidell  <matsl@gnu.org>
+
+* man/hyperbole.texi: Remove not useful @indent.
+
+* Makefile (HYPB_ERT_BATCH_BT): Control abbreviation of backtrace.
+
 2024-08-24  Bob Weiner  <rsw@gnu.org>
 
 * hpath.el (hpath:to-Info-ref): Add.
diff --git a/Makefile b/Makefile
index 1246a05bb6..2dcac9dcfb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     15-Aug-24 at 00:32:27 by Bob Weiner
+# Last-Mod:     24-Aug-24 at 10:41:04 by Mats Lidell
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -512,9 +512,9 @@ endif
 
 # For full backtrace run make test FULL_BT=<anything or even empty>
 ifeq ($(origin FULL_BT), command line)
-HYPB_ERT_BATCH_BT = (ert-batch-backtrace-line-length nil)
+HYPB_ERT_BATCH_BT = (ert-batch-backtrace-line-length t) (backtrace-line-length 
nil)
 else
-HYPB_ERT_BATCH_BT = (ert-batch-backtrace-line-length 256)
+HYPB_ERT_BATCH_BT = (ert-batch-backtrace-line-length 256) 
(backtrace-line-length 5000)
 endif
 
 # Run non-interactive tests in batch mode
@@ -522,7 +522,7 @@ test-ert:
        @echo "# Tests: $(TEST_ERT_FILES)"
        $(EMACS_BATCH) --eval "(load-file \"test/hy-test-dependencies.el\")" \
        --eval "(let ((auto-save-default) (ert-batch-print-level 10) \
-                     (ert-batch-print-length nil) (backtrace-line-length 5000) 
\
+                     (ert-batch-print-length nil) \
                      $(HYPB_ERT_BATCH_BT) (ert-batch-backtrace-right-margin 
2048)) \
                   $(LOAD_TEST_ERT_FILES) $(HYPB_ERT_BATCH))"
 
diff --git a/hbut.el b/hbut.el
index 7f342f87ff..18b789dbe4 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    18-Sep-91 at 02:57:09
-;; Last-Mod:     23-Aug-24 at 21:38:08 by Bob Weiner
+;; Last-Mod:     24-Aug-24 at 11:40:56 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1565,7 +1565,7 @@ include delimiters when INCLUDE-DELIMS is non-nil)."
     (error "(hbut:map-type): `start-delim' must be a string, not '%s'"
           start-delim))
   (unless end-delim
-    (error "(hbut:map-type): `end-delim' must be non-nil" end-delim))
+    (error "(hbut:map-type): `end-delim' must be non-nil"))
 
   (let* ((match-to-start-delim (when end-delim (symbolp end-delim)))
         (end-char (unless match-to-start-delim
diff --git a/hibtypes.el b/hibtypes.el
index d2cae1d480..61738253f6 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 20:45:31
-;; Last-Mod:     23-Aug-24 at 21:32:09 by Mats Lidell
+;; Last-Mod:     24-Aug-24 at 11:32:31 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1693,7 +1693,7 @@ If a boolean function or variable, display its value."
 ;;; ========================================================================
 
 (defib hywiki-existing-word ()
-  "When on a HyWiki word with an existing page, display its page and optional 
section."
+  "On a HyWiki word with an existing page, display its page and optional 
section."
   (cl-destructuring-bind (page-name start end)
       (hywiki-page-exists-p :range)
     (when page-name
diff --git a/hywiki.el b/hywiki.el
index 18495823b6..a4dbacdcea 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    21-Apr-24 at 22:41:13
-;; Last-Mod:     18-Aug-24 at 18:02:28 by Bob Weiner
+;; Last-Mod:     24-Aug-24 at 11:36:20 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 25f7aa22f5..c690ac3ded 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -7,7 +7,7 @@
 @c Author:       Bob Weiner
 @c
 @c Orig-Date:     6-Nov-91 at 11:18:03
-@c Last-Mod:      6-Jul-24 at 00:42:11 by Bob Weiner
+@c Last-Mod:     30-Aug-24 at 01:45:39 by Bob Weiner
 
 @c %**start of header (This is for running Texinfo on a region.)
 @setfilename hyperbole.info
@@ -146,7 +146,7 @@ Texinfo markup language.
 <CENTER><H3><A HREF="mailto:rsw@@gnu.org";>Say thanks or send a testimonial if 
you like Hyperbole.</A></H3></CENTER>
 
 
-<P>Copyright &copy; 1989-2023  Free Software Foundation, Inc.</P>
+<P>Copyright &copy; 1989-2024  Free Software Foundation, Inc.</P>
 
 <P>GNU Hyperbole is available for use, modification, and distribution under
 the terms of the GNU General Public License (GPL) Version 3 or later,
@@ -187,7 +187,7 @@ Printed August 29, 2024.
 
 @sp 2
 @noindent
-Copyright @copyright{} 1989-2023  Free Software Foundation, Inc.
+Copyright @copyright{} 1989-2024  Free Software Foundation, Inc.
 
 GNU Hyperbole is available for use, modification, and distribution
 under the terms of the GNU General Public License (GPL) Version 3 or
@@ -4549,19 +4549,15 @@ loading Hyperbole's HyWiki code.
 @vindex hywiki-org-publishing-directory
 @cindex HyWiki publishing directory
 HyWiki html files are saved in:
-@indent
 @code{(hywiki-org-get-publish-property :publishing-directory)}
 Customize this directory with:
-@indent
 @bkbd{M-x customize-variable @key{RET} hywiki-org-publishing-directory 
@key{RET}}
 
 @vindex hywiki-org-publishing-function
 @cindex HyWiki publishing function
 HyWiki html files are generated by the function given by:
-@indent
 @code{(hywiki-org-get-publish-property :publishing-function)}
 Customize the value of this function if necessary with:
-@indent
 @bkbd{M-x customize-variable @key{RET} hywiki-org-publishing-function 
@key{RET}}
 
 @node HyWiki Menu,  , Publish HyWiki, HyWiki