[elpa] externals/hyperbole bc814ff094 11/14: Merge branch 'master' into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit bc814ff094ed5d37bf72e1ce6b0ca6a863024d28
Merge: 546630e875 00682a4144
Author: bw <rsw@gnu.org>
Commit: bw <rsw@gnu.org>

    Merge branch 'master' into rsw
---
 ChangeLog            |  24 +++++++++-
 Makefile             |  22 ++++++++-
 hycontrol.el         |  11 ++++-
 test/hbut-tests.el   |  15 ++++++-
 test/hyrolo-tests.el | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 189 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f0744a174..9229b03024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,6 @@
 * hbut.el (ibut:insert-text): Use anchor format in link-to-string-match when
     given an instance-num.
 
-
 * hyrolo.el (hyrolo-normalize-mode-function): Add and attach to
     `window-buffer-change-functions' to ensure normal modes are used when 
editing
     Org or Markdown files.
@@ -21,6 +20,29 @@
     them so does not interfere with package manager builds which may also 
generate
     these autoload files.
 
+2024-03-17  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (dockerized): Add target to run make with a dockerized Emacs.
+
+2024-03-16  Mats Lidell  <matsl@gnu.org>
+
+* test/hbut-tests.el (hbut-tests--ibut-at-p-identifies-a-remote-pathname):
+    Add test for ibut:at-p on remote path names.
+
+2024-03-15  Mats Lidell  <matsl@gnu.org>
+
+* hycontrol.el (hycontrol-blank-buffer-name): Make name of the blank
+    buffer customizable.
+
+2024-03-14  Mats Lidell  <matsl@gnu.org>
+
+* test/hyrolo-tests.el (hyrolo-tests--goto-org-match)
+    (hyrolo-tests--goto-kotl-body-match)
+    (hyrolo-tests--goto-kotl-header-match)
+    (hyrolo-tests--goto-kotl-body-with-slash-match)
+    (hyrolo-tests--goto-kotl-header-with-slash-match): Test action key on
+    a hyrolo match.
+
 2024-03-12  Bob Weiner  <rsw@gnu.org>
 
 * hypb-maintenance.el (hypb:web-repo-update): Add "hib-doc-id.el".
diff --git a/Makefile b/Makefile
index 2685eff0e3..c41c0120e5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     10-Mar-24 at 19:45:09 by Bob Weiner
+# Last-Mod:     22-Mar-24 at 08:38:08 by Bob Weiner
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -542,3 +542,23 @@ lint:
        --eval "(hy-test-ensure-package-installed 'package-lint)" \
        -l package-lint.el -f package-lint-batch-and-exit \
        $(EL_KOTL) $(EL_SRC)
+
+# Run a build using a dockerized version of Emacs
+#
+# Usage:
+#   make dockerized version=28.1 targets='clean bin test'
+
+# Specify version and targets to run
+ifeq ($(origin targets), command line)
+DOCKER_TARGETS = ${targets}
+else
+DOCKER_TARGETS = clean bin test
+endif
+ifeq ($(origin version), command line)
+DOCKER_VERSION = ${version}-ci
+else
+DOCKER_VERSION = master-ci
+endif
+
+dockerized:
+       docker run -v $$(pwd):/hyperbole -it silex/emacs:${DOCKER_VERSION} bash 
-c cd hyperbole && make ${DOCKER_TARGETS}
diff --git a/hycontrol.el b/hycontrol.el
index 51a478f585..acf31c8680 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     1-Jun-16 at 15:35:36
-;; Last-Mod:     18-Feb-24 at 12:42:03 by Mats Lidell
+;; Last-Mod:     16-Mar-24 at 00:04:31 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -241,6 +241,13 @@ The final predicate should always be t, for default 
values, typically of zero.")
                                (< value (display-pixel-width)))))
   :group 'hyperbole-screen)
 
+(defcustom hycontrol-blank-buffer-name " BLANK"
+  "Blank buffer name used for to display in extra window grid windows.
+Used after selected buffer list is exhausted.  Start name with a space
+for it to be omitted by `list-buffers'."
+  :type 'string
+  :group 'hyperbole-screen)
+
 (defvar hycontrol-frame-widths
   '(1.0 0.75 0.666 0.5 0.333 0.25)
     "List of width percentages to cycle through when adjusting a frame's width.
@@ -891,7 +898,7 @@ multiple of the default frame font width."
              hycontrol-display-buffer-predicate-list)
     (error "(HyDebug): Invalid expression in 
`hycontrol-display-buffer-predicate-list' - %s" err)))
 
-(defvar hycontrol--blank-buffer (get-buffer-create " BLANK")
+(defvar hycontrol--blank-buffer (get-buffer-create hycontrol-blank-buffer-name)
   "Blank buffer to display in extra window grid windows.
 Used after selected buffer list is exhausted.")
 
diff --git a/test/hbut-tests.el b/test/hbut-tests.el
index f8a6574bb2..a8b4086076 100644
--- a/test/hbut-tests.el
+++ b/test/hbut-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    30-may-21 at 09:33:00
-;; Last-Mod:     11-Feb-24 at 23:35:14 by Mats Lidell
+;; Last-Mod:     16-Mar-24 at 23:44:27 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -768,6 +768,19 @@ See #10 for the proper way to add an ibutton name.
     (hattr:clear 'hbut:current)
     (should-error (ibut:act))))
 
+(ert-deftest hbut-tests--ibut-at-p-identifies-a-remote-pathname ()
+  "Verify `ibut:at-p' identifies a remote pathname."
+  :expected-result :failed
+  (hattr:clear 'hbut:current)
+  (with-temp-buffer
+    (insert "/ssh:user@host.org:/home/user/file\n")
+    (goto-char 4)
+    (should (equal (hattr:get (ibut:at-p) 'categ) 'ibtypes::pathname))
+    (goto-char (- (point-max) 5))
+    (should (equal (hattr:get (ibut:at-p) 'categ) 'ibtypes::pathname))
+    (goto-char 8)  ;; ibtypes::mail-address !!
+    (should (equal (hattr:get (ibut:at-p) 'categ) 'ibtypes::pathname))))
+
 ;; This file can't be byte-compiled without the `el-mock' package (because of
 ;; the use of the `with-mock' macro), which is not a dependency of Hyperbole.
 ;;  Local Variables:
diff --git a/test/hyrolo-tests.el b/test/hyrolo-tests.el
index 9794c01892..177e494372 100644
--- a/test/hyrolo-tests.el
+++ b/test/hyrolo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    19-Jun-21 at 22:42:00
-;; Last-Mod:     21-Mar-24 at 10:53:01 by Bob Weiner
+;; Last-Mod:     22-Mar-24 at 08:37:53 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1513,6 +1513,127 @@ body
       (kill-buffer hyrolo-display-buffer)
       (hy-delete-files-and-buffers hyrolo-file-list))))
 
+(ert-deftest hyrolo-tests--goto-org-body-match ()
+  "Move from body match to target at org file."
+  (let* ((org-file1 (make-temp-file "hypb" nil ".org" 
hyrolo-tests--outline-content-org))
+         (hyrolo-file-list (list org-file1)))
+    (unwind-protect
+        (progn
+          (hyrolo-grep "body")
+          (hyrolo-next-match)
+          (action-key)
+          (should (string= (buffer-file-name) org-file1))
+          (should (looking-at-p "body")))
+      (kill-buffer hyrolo-display-buffer)
+      (hy-delete-files-and-buffers hyrolo-file-list))))
+
+(ert-deftest hyrolo-tests--goto-org-header-match ()
+  "Move from heading match to target at org file."
+  (let* ((org-file1 (make-temp-file "hypb" nil ".org" 
hyrolo-tests--outline-content-org))
+         (hyrolo-file-list (list org-file1)))
+    (unwind-protect
+        (progn
+          (hyrolo-grep "h-org")
+          (hyrolo-next-match)
+          (action-key)
+          (should (string= (buffer-file-name) org-file1))
+          (should (looking-at-p "h-org 1$")))
+      (kill-buffer hyrolo-display-buffer)
+      (hy-delete-files-and-buffers hyrolo-file-list))))
+
+(ert-deftest hyrolo-tests--goto-kotl-body-match ()
+  "Move from body match to target at kotl file."
+  (let* ((kotl-file1 (hyrolo-tests--gen-kotl-outline "h-kotl" "body" 1))
+         (hyrolo-file-list (list kotl-file1)))
+    (unwind-protect
+        (progn
+          (hyrolo-grep "body")
+          (hyrolo-next-match)
+          (action-key)
+          (should (string= (buffer-file-name) kotl-file1))
+          (should (looking-at-p "body$"))
+          (should (string= (buffer-substring-no-properties (point-min) 
(point-max))
+                           "\
+   1. h-kotl
+      body
+
+     1a. h-kotl 1
+         body 1
+
+"                           )))
+      (kill-buffer hyrolo-display-buffer)
+      (hy-delete-files-and-buffers hyrolo-file-list))))
+
+(ert-deftest hyrolo-tests--goto-kotl-header-match ()
+  "Move from heading match to target at first line in kotl file."
+  (let* ((kotl-file1 (hyrolo-tests--gen-kotl-outline "h-kotl" "body" 1))
+         (hyrolo-file-list (list kotl-file1)))
+    (unwind-protect
+        (progn
+          (hyrolo-grep "h-kotl")
+          (hyrolo-next-match)
+          (action-key)
+          (should (string= (buffer-file-name) kotl-file1))
+          (should (looking-at-p "h-kotl$"))
+          (should (string= (buffer-substring-no-properties (point-min) 
(point-max))
+                           "\
+   1. h-kotl
+      body
+
+     1a. h-kotl 1
+         body 1
+
+"                           )))
+      (kill-buffer hyrolo-display-buffer)
+      (hy-delete-files-and-buffers hyrolo-file-list))))
+
+(ert-deftest hyrolo-tests--goto-kotl-body-with-slash-match ()
+  "Move from body match to target line with slash in kotl file."
+  (let* ((kotl-file1 (hyrolo-tests--gen-kotl-outline "h-kotl" "body1 / body2" 
1))
+         (hyrolo-file-list (list kotl-file1)))
+    (unwind-protect
+        (progn
+          (hyrolo-grep "body2")
+          (hyrolo-next-match)
+          (action-key)
+          (should (string= (buffer-file-name) kotl-file1))
+          (should (looking-at-p "body2$"))
+          (should (string= (buffer-substring-no-properties (point-min) 
(point-max))
+                           "\
+   1. h-kotl
+      body1 / body2
+
+     1a. h-kotl 1
+         body1 / body2 1
+
+"                           )))
+      (kill-buffer hyrolo-display-buffer)
+      (hy-delete-files-and-buffers hyrolo-file-list))))
+
+(ert-deftest hyrolo-tests--goto-kotl-header-with-slash-match ()
+  "Move from heading match to target line with a slash in kotl file."
+  :expected-result :failed
+  (let* ((kotl-file1 (hyrolo-tests--gen-kotl-outline "h1 / h2" "body" 1))
+         (hyrolo-file-list (list kotl-file1)))
+    (unwind-protect
+        (progn
+          (hyrolo-grep "h2")
+          (hyrolo-next-match)
+          (action-key)
+          (should (string= (buffer-file-name) kotl-file1))
+          (should (looking-at-p "h2$"))
+          (should (string= (buffer-substring-no-properties (point-min) 
(point-max))
+                           "\
+   1. h1 / h2
+      body
+
+     1a. h1 / h2 1
+         body 1
+
+"                           )))
+      (kill-buffer hyrolo-display-buffer)
+      (hy-delete-files-and-buffers hyrolo-file-list))))
+
 (provide 'hyrolo-tests)
 
 ;; This file can't be byte-compiled without the `el-mock' package