Merge pull request #936 from rswgnu/rsw

hyrolo.el - Fix hyrolo issues caught by new tests

Author: rswgnu

ChangeLog

@@ -1,3 +1,37 @@
+2026-04-12  Bob Weiner  <rsw@gnu.org>
+
+* hyrolo.el (hyrolo-hdr-move-after-p): Fix infinite loop where did not
+    check that (forward-line 1) actually moved, so just kept looping.
+    Now it checks that the return value is zero.  This fixes the test:
+    'hyrolo-tests--outline-hide-other'.
+
+2026-04-11  Bob Weiner  <rsw@gnu.org>
+
+* hsys-consult.el (hsys-consult-get-exit-value): Use 'hypb:function-p'
+    instead of 'functionp' so recognizes symbol names of functions too.
+
+* hibtypes.el (man-apropos): Stop matches to (function (pos)) in elisp
+    by requiring first char in parens to be a 1-9 digit.
+
+* hyrolo.el (hyrolo-outline-level): Remove first cond clause checking
+    for :hyrolo-level which would return 0 for outline-level in Koutlines
+    matched in the hyrolo display buffer because the :hyrolo-level property
+    was not on the first char of the line but indented to the first char
+    of the cell's relative id.  Instead let it fall through to the clause
+    matching 'hyrolo-entry-group-number'.
+            (hyrolo--cache-initialize,
+             hyrolo--cache-major-mode-indexes): Clarified usage in doc string.
+    Initialize to '(1) instead of '(0) so when point is at position 1 in the
+    *HyRolo* buffer which matches to the first position in this list.  The
+    'major-mode' lookup table indexes starting with 1, not 0, so using 0 would
+    return nil for the 'major-mode'.
+            (hyrolo-outline-backward-same-level,
+             hyrolo-outline-forward-same-level): Fix so if within a file hdr
+    moves to the start of the file hdr before trying to move to the next
+    entry at the same level. Update to treat a nil arg as 1, a 0 arg as a
+    no-op, negative args move in the opposite direction and return whether
+    any sibling is found (point moves) or not (point does not move).
+
 2026-04-10  Mats Lidell  <matsl@gnu.org>
 
 * test/hyrolo-tests.el (hyrolo-tests--fgrep-move-test): Add more tests for

hibtypes.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 20:45:31
-;; Last-Mod:     28-Mar-26 at 13:02:39 by Bob Weiner
+;; Last-Mod:     11-Apr-26 at 19:28:10 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -854,7 +854,7 @@ other buffers."
           start
           end
           topic)
-      (when (looking-at (concat "\\(" nm "\\)[ \t]*\\(([-0-9a-zA-z]+)\\)"))
+      (when (looking-at (concat "\\(" nm "\\)[ \t]*\\(([1-9][-0-9a-zA-z]*)\\)"))
         (setq start (match-beginning 0)
               end   (match-end 0))
         (require 'man)

hsys-consult.el

@@ -2,7 +2,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     4-Jul-24 at 09:57:18
-;; Last-Mod:      7-Apr-26 at 23:47:23 by Bob Weiner
+;; Last-Mod:     11-Apr-26 at 19:35:22 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -300,7 +300,7 @@ arguments, store and return its result value into `hsys-consult-exit-value',
 Otherwise, return the selection from CONSULT-FUNCTION."
   (unless hsys-consult-flag
     (error "`%s' command requires `hsys-consult-flag' set to t" this-command))
-  (unless (functionp consult-function)
+  (unless (hypb:function-p consult-function)
     (user-error "(hsys-consult-get-exit-value): First arg must be a function, not `%s'"
 		consult-function))
 

hyrolo.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     7-Jun-89 at 22:08:29
-;; Last-Mod:      8-Apr-26 at 23:12:04 by Bob Weiner
+;; Last-Mod:     12-Apr-26 at 09:29:44 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -2060,8 +2060,8 @@ Return non-nil if point moves, else return nil."
                  ;; Have to move past end-of-line if have moved
                  (when (> (point) opoint)
                    (goto-char (1+ (point)))))
-               (while (looking-at-p "^[ \t]*$")
-		 (forward-line 1))
+               (while (and (looking-at-p "^[ \t]*$")
+		           (zerop (forward-line 1))))
 	       result)
       (goto-char opoint)
       nil)))
@@ -2399,22 +2399,40 @@ Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
   (hyrolo-funcall-match (lambda () (outline-back-to-heading invisible-ok))))
 
 (defun hyrolo-outline-backward-same-level (arg)
-  "Move backward to the ARG'th subheading at same level as this one.
-Stop at the first and last subheadings of a superior heading."
+  "Move backward to the ARG'th subheading at same level as point.
+Return t if point moves; nil otherwise.
+
+File headers and end of buffer are considered level 1.  Stop before the
+first and last subheadings of a superior heading.  If any predecessor
+siblings are found, leave point at the start of the furthest entry entered;
+otherwise, don't move point."
   (interactive "p")
-  (hyrolo-funcall-match
-   (lambda ()
-     (outline-back-to-heading)
-     (while (> arg 0)
-       (let ((point-to-move-to (save-excursion
-				 (hyrolo-outline-get-last-sibling))))
-	 (if point-to-move-to
-	     (progn
-	       (goto-char point-to-move-to)
-	       (setq arg (1- arg)))
-	   (setq arg 0)
-	   (error "No previous same-level heading/header")))))
-   nil t))
+  (unless arg
+    (setq arg 1))
+  (cond ((< arg 0)
+         (hyrolo-outline-forward-same-level (- arg)))
+        ((zerop arg)
+         nil)
+        (t (let ((opoint (point))
+                 found
+                 point-to-move-to)
+             (hyrolo-funcall-match
+              (lambda ()
+                (or (hyrolo-hdr-to-first-line-p)
+                    (outline-back-to-heading))
+                (while (> arg 0)
+                  (if (setq point-to-move-to (save-excursion
+				               (hyrolo-outline-get-last-sibling)))
+	              (progn
+                        (setq found t)
+	                (goto-char point-to-move-to)
+	                (setq arg (1- arg)))
+	            (setq arg 0)))
+                (unless found
+                  (goto-char opoint)
+	          (error "No previous same-level heading/header")))
+              nil t)
+             found))))
 
 (defun hyrolo-outline-demote (&optional which)
   "Demote headings lower down the tree.
@@ -2433,21 +2451,36 @@ nil for WHICH, or do not pass any argument)."
   (hyrolo-funcall-match (lambda () (outline-demote which)) t))
 
 (defun hyrolo-outline-forward-same-level (arg)
-  "Move forward to the ARG'th subheading at same level as this one.
-Stop at the first and last subheadings of a superior heading."
+  "Move forward to the positive ARG'th subheading at same level as point.
+File headers are considered level 1.  Stop before the first and last
+subheadings of a superior heading.  If any siblings are found, leave point
+at the start of the furthest entry entered; otherwise, don't move point."
   (interactive "p")
-  (hyrolo-funcall-match
-   (lambda ()
-     (outline-back-to-heading)
-     (while (> arg 0)
-       (let ((point-to-move-to (save-excursion
-				 (hyrolo-outline-get-next-sibling))))
-	 (if point-to-move-to
-	     (progn
-	       (goto-char point-to-move-to)
-	       (setq arg (1- arg)))
-	   (setq arg 0)
-	   (error "No following same-level heading/header")))))))
+  (unless arg
+    (setq arg 1))
+  (cond ((< arg 0)
+         (hyrolo-outline-backward-same-level (- arg)))
+        ((zerop arg)
+         nil)
+        (t (let ((opoint (point))
+                 found
+                 point-to-move-to)
+             (hyrolo-funcall-match
+              (lambda ()
+                (outline-back-to-heading)
+                (while (> arg 0)
+                  (if (setq point-to-move-to (save-excursion
+				               (hyrolo-outline-get-next-sibling)))
+	              (progn
+                        (setq found t)
+	                (goto-char point-to-move-to)
+	                (setq arg (1- arg)))
+                    ;; If on last entry of the buffer, move to (point-max)
+	            (setq arg 0)))
+                (unless found
+                  (goto-char opoint)
+	          (error "No following same-level heading/header"))))
+             found))))
 
 (defun hyrolo-outline-get-last-sibling ()
   "Move to previous heading of the same level, and return point.
@@ -3400,20 +3433,21 @@ Return final point."
 
 (defun hyrolo-outline-level ()
   "Return the depth to which an entry is nested in the *HyRolo* buffer.
+File headers are considered level 1.
+
 This is actually either the level specified in `outline-heading-alist'
 or else the number of characters matched by `outline-regexp' minus
 trailing periods and whitespace.
 
 Point must be at the beginning of a heading line.
 
-This function is used for every file-type major-mode supported by HyRolo."
+This function is used for every file-type `major-mode' supported by HyRolo."
 
   (or (and outline-heading-alist (looking-at outline-regexp)
            (cdr (assoc (match-string-no-properties 0) outline-heading-alist)))
-      (cond ((hproperty:length-p :hyrolo-level t))
-            ((derived-mode-p 'kotl-mode)
+      (cond ((derived-mode-p 'kotl-mode)
 	     (kcell-view:level))
-            ;; ((hyrolo-hdr-in-p) 1)
+            ((hyrolo-hdr-in-p) 1)
 	    ((looking-at hyrolo-hdr-and-entry-regexp)
 	     (length (match-string hyrolo-entry-group-number)))
 	    (t 0))))
@@ -3425,16 +3459,22 @@ This function is used for every file-type major-mode supported by HyRolo."
 (defvar hyrolo--cache-loc-match-bounds '(1)
   "Ordered list of the bounds of each matched buffer in Hyrolo display buffer.
 First entry represents the start of the first matched buffer and the
-remaining entries are the end points of each matched buffer with the
-HyRolo display matches buffer.")
+remaining entries are the end points of each matched buffer within the
+HyRolo match display buffer.")
 
 ;; Next line prevents `kill-all-local-variables' run on each major
 ;; mode change in the HyRolo display buffer from removing the given
 ;; cache variable.
 (put 'hyrolo--cache-loc-match-bounds 'permanent-local t)
 
-(defvar hyrolo--cache-major-mode-indexes '(0)
-  "Ordered list of major-mode-indexes `hyrolo--cache-loc-match-bounds' positions.")
+(defvar hyrolo--cache-major-mode-indexes '(1)
+  "Ordered keys to select major modes in `hyrolo--cache-major-mode-indexes'.
+Keys may be repeated as multiple files matched in the HyRolo display buffer
+may share the same `major-mode'.
+
+Key ordering matches the ordering of position entries in
+`hyrolo--cache-loc-match-bounds' so that a position in the HyRolo match
+display buffer can be connected to its source buffer `major-mode'.")
 (put 'hyrolo--cache-major-mode-indexes 'permanent-local t)
 
 (defvar hyrolo--cache-major-mode-index 1
@@ -3609,7 +3649,7 @@ Call whenever `hyrolo-display-buffer' is changed."
 
 		;; Don't use '(1) on the next line or the code will not initialize properly
 		hyrolo--cache-loc-match-bounds (list 1)
-		hyrolo--cache-major-mode-indexes (list 0)
+		hyrolo--cache-major-mode-indexes (list 1)
 		hyrolo--cache-major-mode-index 1)))
 
 (defun hyrolo--cache-major-mode (src-buf)

kotl/kotl-mode.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    6/30/93
-;; Last-Mod:     29-Mar-26 at 12:53:49 by Bob Weiner
+;; Last-Mod:     11-Apr-26 at 19:38:12 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -3703,6 +3703,7 @@ but always operates upon the current view."
 (put 'outline 'reveal-toggle-invisible 'kotl-mode:reveal-toggle-invisible)
 (defun kotl-mode:isearch-open-invisible (_overlay)
   (kotl-mode:show-tree))
+
 ;; Adapted from outline-reveal-toggle-invisible; called by isearch.
 (defun kotl-mode:reveal-toggle-invisible (o hidep)
   (if (not (derived-mode-p 'kotl-mode))

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:      8-Apr-26 at 23:14:30 by Bob Weiner
+;; Last-Mod:     11-Apr-26 at 19:28:11 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -461,7 +461,6 @@ Match a string in the second cell."
 
 (ert-deftest hyrolo-tests--fgrep-move-test ()
   "Verify different move commands after `hyrolo-fgrep'."
-  :expected-result :failed
   (let* ((kotl-file1 (hyrolo-tests--gen-kotl-outline "heading" "foo bar" 1))
          (kotl-file2 (hyrolo-tests--gen-kotl-outline "heading" "foo bar" 1))
          (hyrolo-file-list (list kotl-file1 kotl-file2))
@@ -472,9 +471,27 @@ Match a string in the second cell."
           (hyrolo-fgrep "bar")
           (should (string= hyrolo-display-buffer (buffer-name)))
 
-          (ert-info ("Hide first header and move down using ?n")
+          (ert-info ("Hide first header move down using ?f")
             (should (looking-at-p "==="))
             (execute-kbd-macro (kbd "h"))
+            (execute-kbd-macro (kbd "f"))
+            (should (looking-at-p "==="))
+            (execute-kbd-macro (kbd "f"))
+            (should (looking-at-p h1_str))
+            (let ((err (should-error (execute-kbd-macro (kbd "f")))))
+              (should (string-match-p "No following same-level heading/header" (cadr err)))))
+
+          (ert-info ("With hidden first header move up using ?b")
+            (execute-kbd-macro (kbd "b"))
+            (should (looking-at-p "==="))
+            (execute-kbd-macro (kbd "b"))
+            (should (looking-at-p "==="))
+            (should (bobp))
+            (let ((err (should-error (execute-kbd-macro (kbd "b")))))
+              (should (string-match-p "No previous same-level heading/header" (cadr err)))))
+
+          (ert-info ("With hidden first header and move down using ?n")
+            (should (looking-at-p "==="))
             (execute-kbd-macro (kbd "n"))
             (should (looking-at-p "==="))
             (execute-kbd-macro (kbd "n"))
@@ -495,24 +512,6 @@ Match a string in the second cell."
             (should (looking-at-p "==="))
             (should (bobp)))
 
-          (ert-info ("With hidden first header move down using ?f")
-            (should (looking-at-p "==="))
-            (execute-kbd-macro (kbd "f"))
-            (should (looking-at-p "==="))
-            (execute-kbd-macro (kbd "f"))
-            (should (looking-at-p h1_str))
-            (let ((err (should-error (execute-kbd-macro (kbd "f")))))
-              (should (string-match-p "No following same-level heading/header" (cadr err)))))
-
-          (ert-info ("With hidden first header move up using ?b")
-            (execute-kbd-macro (kbd "b"))
-            (should (looking-at-p "==="))
-            (execute-kbd-macro (kbd "b"))
-            (should (looking-at-p "==="))
-            (should (bobp))
-            (let ((err (should-error (execute-kbd-macro (kbd "b")))))
-              (should-not (equal '(void-function nil) err)))) ;FIXME: No error message but void-function!?
-
           (outline-show-all)
 
           (ert-info ("Move down using ?n")