branch: externals/hyperbole
commit f68bf1bab5314f758fe9b4aa7acddcbc65a83b41
Merge: d4fd2ad38b 25ad337b6b
Author: bw <r...@gnu.org>
Commit: bw <r...@gnu.org>
Merge branch 'master' of hyperbole into rsw
---
ChangeLog | 9 +++++++++
Makefile | 6 +++---
test/hibtypes-tests.el | 16 +++++++++++++++-
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 02dbbe1f9a..03e8471ce0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-09-08 Mats Lidell <ma...@gnu.org>
+
+* test/hibtypes-tests.el (ibtypes::hyp-manual-test): Add test.
+
+2024-09-07 Mats Lidell <ma...@gnu.org>
+
+* Makefile (docker, docker-run): Use "--rm" option so the short lived
+ container and its volumes are removed on exit.
+
2024-09-02 Bob Weiner <r...@gnu.org>
* man/hyperbole.texi (Action Button Link Types): Change PYTHONLIBPATH to
diff --git a/Makefile b/Makefile
index 2dcac9dcfb..1a1dbf9943 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
-# Last-Mod: 24-Aug-24 at 10:41:04 by Mats Lidell
+# Last-Mod: 7-Sep-24 at 16:29:00 by Mats Lidell
#
# Copyright (C) 1994-2023 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
@@ -609,10 +609,10 @@ DOCKER_VERSION = master-ci
endif
docker: docker-update
- docker run -v $$(pwd):/hypb -v /tmp:/hypb-tmp -it
silex/emacs:${DOCKER_VERSION} bash -c "cp -a /hypb /hyperbole && make -C
hyperbole ${DOCKER_TARGETS}"
+ docker run -v $$(pwd):/hypb -v /tmp:/hypb-tmp -it --rm
silex/emacs:${DOCKER_VERSION} bash -c "cp -a /hypb /hyperbole && make -C
hyperbole ${DOCKER_TARGETS}"
docker-run: docker-update
- docker run -v $$(pwd):/hypb -v /tmp:/hypb-tmp -it
silex/emacs:${DOCKER_VERSION}
+ docker run -v $$(pwd):/hypb -v /tmp:/hypb-tmp -it --rm
silex/emacs:${DOCKER_VERSION}
# Update the docker image for the specified version of Emacs
docker-update:
diff --git a/test/hibtypes-tests.el b/test/hibtypes-tests.el
index acac882990..3998c5bd73 100644
--- a/test/hibtypes-tests.el
+++ b/test/hibtypes-tests.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell <ma...@gnu.org>
;;
;; Orig-Date: 20-Feb-21 at 23:45:00
-;; Last-Mod: 10-Aug-24 at 23:27:05 by Mats Lidell
+;; Last-Mod: 8-Sep-24 at 00:48:52 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -190,6 +190,20 @@
(buffer-live-p visited-buf))
(kill-buffer visited-buf)))))
+;; hyp-manual
+(ert-deftest ibtypes::hyp-manual-test ()
+ "Verify ibut for Hyperbole manual file path."
+ (with-temp-buffer
+ (insert "\"hyperbole.html#Smart Keys\"")
+ (goto-char 2)
+ (mocklet (((actypes::www-url (concat "file://" (expand-file-name
"hyperbole.html" (hpath:expand "${hyperb:dir}/man/")) "#Smart-Keys")) => t))
+ (ibtypes::hyp-manual)))
+ (with-temp-buffer
+ (insert "\"hyperbole.texi#Smart Keys\"")
+ (goto-char 2)
+ (mocklet (((actypes::link-to-file (concat (expand-file-name
"hyperbole.texi" (hpath:expand "${hyperb:dir}/man/")) "#Smart Keys")) => t))
+ (ibtypes::hyp-manual))))
+
;; markdown
; Can't find out how to use the markdown-internal-link ibtypes!?
