[elpa] externals/hyperbole ebad245f63 2/9: Merge branch 'master' into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit ebad245f633e03df3c2f3652a07b6829a54cb249
Merge: 6cd7a45434 3253909599
Author: bw <rsw@gnu.org>
Commit: bw <rsw@gnu.org>

    Merge branch 'master' into rsw
---
 ChangeLog | 6 ++++++
 Makefile  | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e1bb43b512..793b3aaa9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,12 @@
             (hywiki-read-new-page-name): Use any potential WikiWord at
     point as the default.
 
+2024-11-23  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (BATCHFLAGS): Use debug-on-error's default value nil. Emacs 31
+    introduces calling man using with-demoted-errors which
+    causes an error when requiring man when debug-on-error is set to t.
+
 2024-11-22  Bob Weiner  <rsw@gnu.org>
 
 * hywiki.el (hywiki-find-page): Add missing second interactive
diff --git a/Makefile b/Makefile
index a3c2726386..5bf36c2b28 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     17-Nov-24 at 00:02:09 by Mats Lidell
+# Last-Mod:     23-Nov-24 at 11:23:02 by Mats Lidell
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -191,7 +191,7 @@ PRELOADS = $(SITE_PRELOADS) -l ./hload-path.el -l 
./hversion.el -l ./hyperbole.e
 
 # Compile in batch mode.  Load site-lisp/site-start.el, which may set 
load-path.
 # Show complete expression; do not abbreviate any exprs in batch logs with ...
-BATCHFLAGS = --batch --quick --eval "(progn (setq debug-on-error t) (setq 
backtrace-line-length 0) \
+BATCHFLAGS = --batch --quick --eval "(progn (setq backtrace-line-length 0) \
                                  (message \"  emacs-version = %s\n  
system-configuration = %s\n  emacs = %s%s\n  load-path = %s\" emacs-version 
system-configuration invocation-directory invocation-name load-path))"
 
 EMACS_BATCH=$(EMACS) $(BATCHFLAGS) $(PRELOADS)