From 067347eb202881393ca93842ee808e40e1be43dd Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Wed, 30 Sep 2026 23:49:29 +0200 Subject: [PATCH 1/3] Install use-package for pre Emacs 29 * install-test/elpa-devel-emacs: * install-test/elpa-emacs: * install-test/melpa-releases-emacs: * install-test/melpa-snapshots-emacs: * install-test/straight-emacs: * install-test/tarball-emacs: Install use-package for pre Emacs 29. --- install-test/elpa-devel-emacs | 3 +++ install-test/elpa-emacs | 4 ++++ install-test/melpa-releases-emacs | 3 +++ install-test/melpa-snapshots-emacs | 4 ++++ install-test/straight-emacs | 3 +++ install-test/tarball-emacs | 5 +++++ 6 files changed, 22 insertions(+) diff --git a/install-test/elpa-devel-emacs b/install-test/elpa-devel-emacs index 95c735eb..580fa8ef 100644 --- a/install-test/elpa-devel-emacs +++ b/install-test/elpa-devel-emacs @@ -3,6 +3,9 @@ (require 'package) (add-to-list 'package-archives '("gnu-devel" . "https://elpa.gnu.org/devel/")) +(when (version< emacs-version "29") + (package-install 'use-package)) + (unless (locate-library "hyperbole") (package-install 'hyperbole)) diff --git a/install-test/elpa-emacs b/install-test/elpa-emacs index 6539dfac..989c7005 100644 --- a/install-test/elpa-emacs +++ b/install-test/elpa-emacs @@ -1,6 +1,10 @@ ;;; -*- mode: emacs-lisp; lexical-binding: t; -*- (require 'package) + +(when (version< emacs-version "29") + (package-install 'use-package)) + (unless (locate-library "hyperbole") (package-install 'hyperbole)) diff --git a/install-test/melpa-releases-emacs b/install-test/melpa-releases-emacs index a6cb1599..f5dfff77 100644 --- a/install-test/melpa-releases-emacs +++ b/install-test/melpa-releases-emacs @@ -4,6 +4,9 @@ (add-to-list 'package-archives '("melpa-releases" . "https://releases.melpa.org/packages/")) (setq package-pinned-packages '((hyperbole . "melpa-releases"))) +(when (version< emacs-version "29") + (package-install 'use-package)) + (unless (locate-library "hyperbole") (package-install 'hyperbole)) diff --git a/install-test/melpa-snapshots-emacs b/install-test/melpa-snapshots-emacs index 6d003dc7..ccad0b79 100644 --- a/install-test/melpa-snapshots-emacs +++ b/install-test/melpa-snapshots-emacs @@ -2,6 +2,10 @@ (require 'package) (add-to-list 'package-archives '("melpa-snapshots" . "https://snapshots.melpa.org/packages/")) + +(when (version< emacs-version "29") + (package-install 'use-package)) + (setq package-pinned-packages '((hyperbole . "melpa-snapshots"))) (unless (locate-library "hyperbole") diff --git a/install-test/straight-emacs b/install-test/straight-emacs index a5cdaf96..6d979208 100644 --- a/install-test/straight-emacs +++ b/install-test/straight-emacs @@ -20,4 +20,7 @@ :host nil :repo "https://git.savannah.gnu.org/git/hyperbole.git")) +(when (version< emacs-version "29") + (straight-use-package 'use-package)) + ;;; End straight-emacs diff --git a/install-test/tarball-emacs b/install-test/tarball-emacs index 30c6f700..aef21138 100644 --- a/install-test/tarball-emacs +++ b/install-test/tarball-emacs @@ -1,6 +1,11 @@ ;;; -*- mode: emacs-lisp; lexical-binding: t; -*- ;; tarball -- hyperbole installed from a tar ball +(require 'package) + +(when (version< emacs-version "29") + (package-install 'use-package)) + (unless (and (featurep 'hyperbole) hyperbole-mode) (push (expand-file-name "hyperbole" (getenv "HOME")) load-path) (require 'hyperbole) From ee0fbf8d65df233a16fea22da6fc3eae767c2c2e Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Wed, 30 Sep 2026 23:50:49 +0200 Subject: [PATCH 2/3] Exit with no error if not debugging * install-test/install-test.sh: Don't let debug check set return status --- install-test/install-test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install-test/install-test.sh b/install-test/install-test.sh index e2448cfd..93d1413b 100755 --- a/install-test/install-test.sh +++ b/install-test/install-test.sh @@ -40,4 +40,7 @@ else fi # Debug - after install -[[ -n "$debug" ]] && bash +if [[ -n "$debug" ]] +then + bash +fi From 4aef8bbae245b689930db989bd9a7ff6084ced59 Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Wed, 30 Sep 2026 23:57:34 +0200 Subject: [PATCH 3/3] Add ChangeLog --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index a9dee689..4490da17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2026-10-01 Mats Lidell + +* install-test/install-test.sh: Don't let debug check set return status. + +* install-test/elpa-devel-emacs: +* install-test/elpa-emacs: +* install-test/melpa-releases-emacs: +* install-test/melpa-snapshots-emacs: +* install-test/straight-emacs: +* install-test/tarball-emacs: Install use-package for pre Emacs 29. + 2026-10-01 Bob Weiner * test/hyrolo-tests.el (hyrolo-tests--gen-kotl-outline): Fix kotl tests