Skip to content

Commit

Permalink
org-capture-kill: Fix capture boundaries when deleting empty lines above
Browse files Browse the repository at this point in the history
* lisp/org-capture.el (org-capture-place-entry):
(org-capture-place-item):
(org-capture-place-table-line):
(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
  • Loading branch information
Ihor Radchenko committed Jul 31, 2022
1 parent 2861d9c commit 2ea0830
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lisp/org-capture.el
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ may have been stored before."
;; Make sure that last point is not folded.
(org-fold-core-cycle-over-indirect-buffers
(org-fold-region (max 1 (1- (point-max))) (point-max) nil))))
(let ((origin (point)))
(let ((origin (point-marker)))
(unless (bolp) (insert "\n"))
(org-capture-empty-lines-before)
(let ((beg (point)))
Expand Down Expand Up @@ -1245,7 +1245,7 @@ may have been stored before."
(point))
beg)))))))
;; 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.
Expand Down Expand Up @@ -1346,7 +1346,7 @@ may have been stored before."
;; 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.
Expand Down Expand Up @@ -1375,7 +1375,7 @@ may have been stored before."
(t
(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
Expand Down Expand Up @@ -1407,7 +1407,7 @@ Of course, if exact position has been required, just put it there."
(t
;; 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-empty-lines-before)
(org-capture-position-for-last-stored (point))
Expand Down

0 comments on commit 2ea0830

Please sign in to comment.