[elpa] externals/hyperbole 1907156d82 2/2: Merge branch 'master' of hyperbole

[ELPA Syncer]

branch: externals/hyperbole
commit 1907156d828ddf01c1fa5d6d39387e432ca60361
Merge: 422cf12f3e e9ed3706b5
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Merge branch 'master' of hyperbole
---
 ChangeLog             | 6 ++++++
 test/hib-kbd-tests.el | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5feea8a5b4..35cc1f054e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+<<<<<<< HEAD
 2022-03-26  Bob Weiner  <rsw@gnu.org>
 
 * hyrolo.el (hyrolo-add): Fix both top-level and multi-level insertion.
             (hyrolo-entry-name-regexp): Add.
   test/hyrolo-tests.el (hyrolo-add-items-at-multiple-levels): Add from Mats.
 
+2022-03-26  Mats Lidell  <matsl@gnu.org>
+
+* test/hib-kbd-tests.el (kbd-key-hy-demo-factorial-test): Preload DEMO
+    file to avoid race with *ert* display.
+
 2022-03-20  Bob Weiner  <rsw@gnu.org>
 
 * HY-NEWS (New Tree Promotion/Demotion Keys):
diff --git a/test/hib-kbd-tests.el b/test/hib-kbd-tests.el
index 291181afac..bca9e0d56f 100644
--- a/test/hib-kbd-tests.el
+++ b/test/hib-kbd-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    30-Jan-21 at 12:00:00
-;; Last-Mod:      6-Feb-22 at 00:55:55 by Bob Weiner
+;; Last-Mod:     26-Mar-22 at 11:25:43 by Mats Lidell
 ;;
 ;; Copyright (C) 2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -36,6 +36,11 @@
   (skip-unless (not noninteractive))
   (unwind-protect
       (progn
+        ;; Preload DEMO file to avoid race with *ert* buffer and set
+        ;; *ert* buffer current
+        (hypb:display-file-with-logo "DEMO")
+        (set-buffer "*ert*")
+
         (should (hact 'kbd-key "C-u C-h h d d"))
         (hy-test-helpers:consume-input-events)
         (should (string= (buffer-name (current-buffer)) "DEMO" ))