Merge pull request #937 from rswgnu/rsw

kotl-mode:split-cell - Fix to remove any whitespace at the split loc

Author: rswgnu

ChangeLog

@@ -1,5 +1,11 @@
 2026-04-12  Bob Weiner  <rsw@gnu.org>
 
+* kotl/kotl-mode.el (kotl-mode:split-cell): Fix extra blank line(s)
+    remaining after split a cell.  Now removes all whitespace, including
+    newlines  around the point where the split occurs.
+  test/kotl-mode-tests.el (kotl-mode-split-cell): Above fixes this test
+    so remove ':expected-result :failed'.
+
 * 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:

kotl/kotl-mode.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    6/30/93
-;; Last-Mod:     11-Apr-26 at 19:38:12 by Bob Weiner
+;; Last-Mod:     12-Apr-26 at 11:24:21 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -3035,6 +3035,7 @@ replicated in the new cell."
   (interactive "*P")
   ;; delete any surrounding whitespace
   (delete-horizontal-space)
+  (delete-region (point) (progn (skip-chars-backward "\n\r\t ") (point)))
   (let ((new-cell-contents (kotl-mode:kill-region
 			    (point) (kcell-view:end-contents) 'string))
 	(start (kcell-view:start))

test/kotl-mode-tests.el

@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    18-May-21 at 22:14:10
-;; Last-Mod:     20-Jan-26 at 00:21:25 by Mats Lidell
+;; Last-Mod:     12-Apr-26 at 11:24:18 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -461,13 +461,23 @@
 
 (ert-deftest kotl-mode-split-cell ()
   "Kotl-mode split cell."
-  :expected-result :failed
   (let ((kotl-file (make-temp-file "hypb" nil ".kotl")))
     (unwind-protect
         (with-current-buffer (find-file kotl-file)
+          (ert-info ("Split before second line; remove all whitespace at split")
+            (insert "first \t")
+            (kotl-mode:newline 1)
+            (insert " \tsecond")
+            (kotl-mode:beginning-of-line)
+            (kotl-mode:split-cell)
+            (should (= (line-number-at-pos) 3))
+            (should (string= (kcell-view:contents) "second"))
+            (kotl-mode:previous-cell 1)
+            (should (string= (kcell-view:contents) "first")))
           (ert-info ("Split on first line")
-            (insert "firstsecond\n")
-            (backward-char 7)
+            (kotl-mode:kill-tree 0)
+            (insert "firstsecond")
+            (backward-char 6)
             (kotl-mode:split-cell)
             (should (string= (kcell-view:label (point)) "2"))
             (kotl-mode:demote-tree 0)
@@ -481,14 +491,6 @@
             (kotl-mode:previous-line 1)
             (kotl-mode:end-of-line)
             (kotl-mode:split-cell)
-            (should (= (line-number-at-pos) 3)))
-          (ert-info ("Split before second line")
-            (kotl-mode:kill-tree 0)
-            (insert "first")
-            (kotl-mode:newline 1)
-            (insert "second")
-            (kotl-mode:beginning-of-line)
-            (kotl-mode:split-cell)
             (should (= (line-number-at-pos) 3))))
       (hy-delete-file-and-buffer kotl-file))))