Merge branch 'master' into rsw

Author: rswgnu

ChangeLog

@@ -35,6 +35,11 @@
 
 * hproperty.el (hproperty:length): Add and use in HyRolo.
 
+2026-04-02  Mats Lidell  <matsl@gnu.org>
+
+* hsys-org.el (hsys-org-id-find-advice): Fix docstring has wrong usage
+    of unescaped single quotes and make first line a sentence.
+
 2026-03-31  Bob Weiner  <rsw@gnu.org>
 
 * hyrolo.el (hyrolo-outline-next-visible-heading): Optimize performance in
@@ -64,6 +69,14 @@
             (hyrolo-next-match): Speed up a bit with local vars and add in-line
     comments to explain logic.
 
+2026-03-30  Mats Lidell  <matsl@gnu.org>
+
+* test/kotl-mode-tests.el (kotl-mode-split-cell): Use kotl-mode:kill-tree
+    with new arg 0 for clearer reuse of test buffer.
+    (kotl-mode--kill-tree-erase-buffer): Add test for arg 0 to erase buffer.
+    (kotl-mode--kill-tree-first-and-only-tree): Add test for verifying
+    removing one tree.
+
 2026-03-29  Bob Weiner  <rsw@gnu.org>
 
 * man/hyperbole.texi (Testing): Update from 200 to 660 automated test cases.

hsys-org.el

@@ -217,10 +217,11 @@ otherwise, just match to the single tag around point."
   (hsys-org-get-agenda-tags #'hywiki-tags-view))
 
 (defun hsys-org-id-find-advice (&rest _)
-  "If `org-roam' is loaded and has advised `org-id-find' with the function
-'org-roam-id-find' but Emacs does not have the `sqlite' module, then any
-call to `org-id-find' will fail.  This :before advice function fixes this
-by removing the `org-roam' advice from `org-id-find'."
+  "Remove the `org-roam' advice from `org-id-find' if present.
+If `org-roam' is loaded and has advised `org-id-find' with the function
+`org-roam-id-find' but Emacs does not have the `sqlite' module, then any
+call to `org-id-find' will fail.  This :before advice function fixes this by
+removing the `org-roam' advice from `org-id-find'."
   (when (and (fboundp 'org-roam-id-find)
              (not (hypb:sqlite-p))
              (hypb:advised-p 'org-id-find 'org-roam-id-find))

test/kotl-mode-tests.el

@@ -430,6 +430,35 @@
           (should (string= (kcell-view:idstamp) "03")))
       (hy-delete-file-and-buffer kotl-file))))
 
+(ert-deftest kotl-mode--kill-tree-first-and-only-tree ()
+  "Verify removing a one cell tree creates an initial empty first cell."
+  (let ((kotl-file (make-temp-file "hypb" nil ".kotl")))
+    (unwind-protect
+        (with-current-buffer (find-file kotl-file)
+          (insert "first")
+          (kotl-mode:add-child 1 "second")
+          (kotl-mode:beginning-of-buffer)
+          (kotl-mode:kill-tree)
+          (should (kotl-mode:first-cell-p))
+          (should (string-empty-p (kcell-view:contents))))
+      (hy-delete-file-and-buffer kotl-file))))
+
+(ert-deftest kotl-mode--kill-tree-erase-buffer ()
+  "Verify buffer is erased leaving just the initial empty first cell."
+  (with-temp-buffer
+    (kotl-mode)
+    (kotl-mode:kill-tree 0)
+    (kotl-mode:end-of-buffer)
+    (should (kotl-mode:first-cell-p))
+    (should (string-empty-p (kcell-view:contents)))
+
+    (dotimes (i 20)
+      (kotl-mode:add-cell 1 "contents"))
+    (kotl-mode:kill-tree 0)
+    (kotl-mode:end-of-buffer)
+    (should (kotl-mode:first-cell-p))
+    (should (string-empty-p (kcell-view:contents)))))
+
 (ert-deftest kotl-mode-split-cell ()
   "Kotl-mode split cell."
   :expected-result :failed
@@ -445,7 +474,7 @@
             (should (string= (kcell-view:label (point)) "1a"))
             (should (string= (kcell-view:idstamp) "02")))
           (ert-info ("Split after first line")
-            (kotl-mode:kill-tree)
+            (kotl-mode:kill-tree 0)
             (insert "first")
             (kotl-mode:newline 1)
             (insert "second")
@@ -454,7 +483,7 @@
             (kotl-mode:split-cell)
             (should (= (line-number-at-pos) 3)))
           (ert-info ("Split before second line")
-            (kotl-mode:kill-tree)
+            (kotl-mode:kill-tree 0)
             (insert "first")
             (kotl-mode:newline 1)
             (insert "second")