Skip to content

fix kotl mode delete char with active region #842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matsl merged 5 commits into from
Jan 20, 2026
Merged

fix kotl mode delete char with active region #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31e3742
Add region behavior for kotl-mode:delete-char et al plus tests
matsl Jan 16, 2026
7d5411b
Fix multiple char deletion with kill-flag
matsl Jan 18, 2026
7365dfb
Add ChangeLog
matsl Jan 19, 2026
a4a2739
Add test for interactive backward delete for multiple chars
matsl Jan 19, 2026
6d5396c
Fix typo
matsl Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2026-01-19 Mats Lidell <[email protected]>

* test/kotl-mode-tests.el (kotl-mode--delete-region)
(kotl-mode--delete-char): Add tests.

* kotl/kotl-mode.el (kotl-mode:delete-char-acc): Accumulate deleted chars
to setup kill-ring.
(kotl-mode:delete-char, kotl-mode:delete-backward-char): Fix
inconsistencies with delete-char - Support transient mark mode. Use
kotl-mode:delete-char-acc for saving multiple chars to kill-ring when
called with kill-flag. (The latter is implicit when used interactively
with a prefix arg.)

2026-01-07 Mats Lidell <[email protected]>

* hywiki.el (hywiki-mode): Remove arg value :toggle, not an alternative to
Expand Down
170 changes: 103 additions & 67 deletions kotl/kotl-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 6/30/93
;; Last-Mod: 1-Jan-26 at 18:18:27 by Mats Lidell
;; Last-Mod: 19-Jan-26 at 22:34:04 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -446,14 +446,17 @@ With optional prefix arg DELETE-FLAG, delete region."
Return number of characters deleted.
Optional KILL-FLAG non-nil means save in kill ring instead of deleting.
Do not delete across cell boundaries."
(interactive "*P")
(when (called-interactively-p 'interactive)
(when current-prefix-arg
(setq kill-flag t
arg (prefix-numeric-value current-prefix-arg))))
(unless arg
(setq arg 1))
(kotl-mode:delete-char (- arg) kill-flag))
(interactive "*p\nP")
(cond ((and (use-region-p)
delete-active-region
(= arg 1))
;; If a region is active, kill or delete it.
(if (or kill-flag
(eq delete-active-region 'kill))
(kotl-mode:kill-region (region-beginning) (region-end))
(kotl-mode:delete-region (region-beginning) (region-end))))
(t
(kotl-mode:delete-char (- arg) kill-flag))))

(defun kotl-mode:delete-blank-lines ()
"On blank line in a cell, delete all surrounding blank lines, leaving just one.
Expand All @@ -478,69 +481,95 @@ whitespace at the end of the cell."
(delete-region (max start (point)) end)))
(kotl-mode:to-valid-position))

(defvar kotl-mode:delete-char-acc nil
"Accumulate deleted chars to populate `kill-ring'.")

(defun kotl-mode:delete-char-acc (arg kill-flag)
"Delete one character and accumulate in the kill ring.
Deletes (forward if ARG > 0, backward if ARG < 0).
First call creates a new kill ring entry, subsequent calls appends.
With KILL-FLAG nil just call `delete-char'."
(if (not kill-flag)
(delete-char arg)
(let ((char (char-to-string (if (< arg 0)
(char-before)
(char-after)))))
(delete-char arg)
(if kotl-mode:delete-char-acc
(kill-append char (< arg 0))
(kill-new char)
(setq kotl-mode:delete-char-acc t)))))

(defun kotl-mode:delete-char (arg &optional kill-flag)
"Delete up to prefix ARG characters following point.
Return number of characters deleted.
Optional KILL-FLAG non-nil means save in kill ring instead of deleting.
Do not delete across cell boundaries."
(interactive "*P")
(when (called-interactively-p 'interactive)
(when current-prefix-arg
(setq kill-flag t
arg (prefix-numeric-value current-prefix-arg))))
(unless arg
(setq arg 1))

(if (not (and (boundp 'kotl-kview) (kview:is-p kotl-kview)))
;; Support use within Org tables outside of the Koutliner
(delete-char arg kill-flag)
(let ((del-count 0)
(indent (kcell-view:indent))
count start end)
(cond ((> arg 0)
(if (kotl-mode:eocp)
(error "(kotl-mode:delete-char): End of cell")
(setq end (kcell-view:end)
arg (min arg (- end (point))))
(while (and (> arg 0) (not (kotl-mode:eocp)))
(if (kotl-mode:eolp)
(if (not (eq ?\ (char-syntax (following-char))))
(setq arg 0
del-count (1- del-count))
(delete-char 1 kill-flag)
;; There may be non-whitespace characters in the
;; indent area. Don't delete them.
(setq count indent)
(while (and (> count 0)
(eq ?\ (char-syntax (following-char))))
(delete-char 1)
(setq count (1- count))))
(delete-char 1 kill-flag))
(setq arg (1- arg)
del-count (1+ del-count)))))
((< arg 0)
(if (kotl-mode:bocp)
(error "(kotl-mode:delete-char): Beginning of cell")
(setq start (kcell-view:start)
arg (max arg (- start (point))))
(while (and (< arg 0) (not (kotl-mode:bocp)))
(if (kotl-mode:bolp)
(if (not (eq ?\ (char-syntax (preceding-char))))
(setq arg 0
del-count (1- del-count))
;; There may be non-whitespace characters in the
;; indent area. Don't delete them.
(setq count indent)
(while (and (> count 0)
(eq ?\ (char-syntax (preceding-char))))
(delete-char -1)
(setq count (1- count)))
(if (zerop count)
(delete-char -1 kill-flag)))
(delete-char -1 kill-flag))
(setq arg (1+ arg)
del-count (1+ del-count))))))
del-count)))
(interactive "*p\nP")
(unless (integerp arg)
(signal 'wrong-type-argument (list 'integerp arg)))
(cond ((and (use-region-p)
delete-active-region
(= arg 1))
;; If a region is active, kill or delete it.
(if (or kill-flag
(eq delete-active-region 'kill))
(kotl-mode:kill-region (region-beginning) (region-end))
(kotl-mode:delete-region (region-beginning) (region-end))))
(t
(if (not (and (boundp 'kotl-kview) (kview:is-p kotl-kview)))
;; Support use within Org tables outside of the Koutliner
(delete-char arg kill-flag)
(let ((del-count 0)
(indent (kcell-view:indent))
count start end
kotl-mode:delete-char-acc)
(cl-flet ((delete-char (arg &optional kill-flag)
(kotl-mode:delete-char-acc arg kill-flag)))
(cond ((> arg 0)
(if (kotl-mode:eocp)
(error "(kotl-mode:delete-char): End of cell")
(setq end (kcell-view:end)
arg (min arg (- end (point))))
(while (and (> arg 0) (not (kotl-mode:eocp)))
(if (kotl-mode:eolp)
(if (not (eq ?\ (char-syntax (following-char))))
(setq arg 0
del-count (1- del-count))
(delete-char 1 kill-flag)
;; There may be non-whitespace characters in the
;; indent area. Don't delete them.
(setq count indent)
(while (and (> count 0)
(eq ?\ (char-syntax (following-char))))
(delete-char 1)
(setq count (1- count))))
(delete-char 1 kill-flag))
(setq arg (1- arg)
del-count (1+ del-count)))))
((< arg 0)
(if (kotl-mode:bocp)
(error "(kotl-mode:delete-char): Beginning of cell")
(setq start (kcell-view:start)
arg (max arg (- start (point))))
(while (and (< arg 0) (not (kotl-mode:bocp)))
(if (kotl-mode:bolp)
(if (not (eq ?\ (char-syntax (preceding-char))))
(setq arg 0
del-count (1- del-count))
;; There may be non-whitespace characters in the
;; indent area. Don't delete them.
(setq count indent)
(while (and (> count 0)
(eq ?\ (char-syntax (preceding-char))))
(delete-char -1)
(setq count (1- count)))
(if (zerop count)
(delete-char -1 kill-flag)))
(delete-char -1 kill-flag))
(setq arg (1+ arg)
del-count (1+ del-count)))))))
del-count)))))

(defun kotl-mode:delete-horizontal-space ()
"Delete all spaces and tabs around point."
Expand Down Expand Up @@ -797,6 +826,13 @@ If a completion is active, this aborts the completion only."
((mark t)
(indicate-copied-region)))))))

(defun kotl-mode:delete-region (start end)
"Delete region between START and END within a single kcell.
Delegates to `kotl-mode:kill-region' but does not store killed text in
`kill-ring'."
(let (kill-ring kill-ring-yank-pointer)
(kotl-mode:kill-region start end)))

(defun kotl-mode:kill-or-copy-region (start end copy-flag &optional kill-str)
(when (and start end)
(let ((indent (kcell-view:indent))
Expand Down
Loading