emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Ihor Radchenko <yantar92@gmail.com>
To: Caleb Chase <caleb@chasecaleb.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG] org-capture-kill: doesn't remove the right text region
Date: Sun, 24 Jul 2022 14:21:59 +0800	[thread overview]
Message-ID: <874jz7rpx4.fsf@localhost> (raw)
In-Reply-To: <CAGyCDkPos+W_MEJffSZga83NsOLZx2XGTYEmSGQuHQvS-sNa8A@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

Caleb Chase <caleb@chasecaleb.com> writes:

> I discovered a bug with org-capture and org-capture kill when
> canceling an item or plain type template on a heading that has only an
> empty line for content. Minimal reproduction is as follows:

The fix is attached.
The reason why this bug is happening is `org-capture-empty-lines-before`
adding/removing the lines before the capture region. This situation was
not considered by org-capture.

Note that `org-capture-empty-lines-before` changes are not going to be
restored upon capture abortion. Fixing this will not be trivial (AFAIU,
suggestions are welcome) and the gains are marginal - I doubt that
anyone is going to care much about this side effect. Of course, feel
free to disagree by replying.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-capture-kill-Fix-capture-boundaries-when-deletin.patch --]
[-- Type: text/x-patch, Size: 2744 bytes --]

From 66c3f8c6f54ec4a4aa4a3ca567e9c2ff5370246e Mon Sep 17 00:00:00 2001
Message-Id: <66c3f8c6f54ec4a4aa4a3ca567e9c2ff5370246e.1658643473.git.yantar92@gmail.com>
From: Ihor Radchenko <yantar92@gmail.com>
Date: Sun, 24 Jul 2022 14:14:58 +0800
Subject: [PATCH] org-capture-kill: Fix capture boundaries when deleting empty
 lines above

* lisp/org-capture.el (org-capture-place-entry):
(org-capture-place-plain-text): Store beginning of the capture region
as marker.  This will make the ORIGIN move if
`org-capture-empty-lines-before` has to add/remove lines.

Fixes https://orgmode.org/list/CAGyCDkPos+W_MEJffSZga83NsOLZx2XGTYEmSGQuHQvS-sNa8A@mail.gmail.com
 lisp/org-capture.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 8748b7f84..6ca66835a 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1178,7 +1178,7 @@ (defun org-capture-place-entry ()
         ;; Make sure that last point is not folded.
           (org-fold-region (max 1 (1- (point-max))) (point-max) nil))))
-    (let ((origin (point)))
+    (let ((origin (point-marker)))
       (unless (bolp) (insert "\n"))
       (let ((beg (point)))
@@ -1243,7 +1243,7 @@ (defun org-capture-place-item ()
     ;; Insert template.
-    (let ((origin (point)))
+    (let ((origin (point-marker)))
       (unless (bolp) (insert "\n"))
       ;; When a new list is created, always obey to `:empty-lines' and
       ;; friends.
@@ -1344,7 +1344,7 @@ (defun org-capture-place-table-line ()
       ;; No table found.  Create it with an empty header.
       (goto-char end)
       (unless (bolp) (insert "\n"))
-      (let ((origin (point)))
+      (let ((origin (point-marker)))
 	(insert "|   |\n|---|\n")
 	(narrow-to-region origin (point))))
     ;; In the current table, find the appropriate location for TEXT.
@@ -1373,7 +1373,7 @@ (defun org-capture-place-table-line ()
       (goto-char (org-table-end))))
     ;; Insert text and position point according to template.
-    (let ((origin (point)))
+    (let ((origin (point-marker)))
       (unless (bolp) (insert "\n"))
       (let ((beg (point))
 	    (end (save-excursion
@@ -1405,7 +1405,7 @@ (defun org-capture-place-plain-text ()
     ;; Beginning or end of file.
     (goto-char (if (org-capture-get :prepend) (point-min) (point-max)))))
-  (let ((origin (point)))
+  (let ((origin (point-marker)))
     (unless (bolp) (insert "\n"))
     (org-capture-position-for-last-stored (point))

  parent reply	other threads:[~2022-07-24  6:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-14 21:24 [BUG] org-capture-kill: doesn't remove the right text region Caleb Chase
2022-07-17 10:00 ` Ihor Radchenko
2022-07-24  6:21 ` Ihor Radchenko [this message]
2022-07-31  5:06   ` Ihor Radchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=874jz7rpx4.fsf@localhost \
    --to=yantar92@gmail.com \
    --cc=caleb@chasecaleb.com \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).