On 20/09/2022 20:16, Ihor Radchenko wrote:
Max Nikulin writes:When REMOVE is non-nil, remove the subtree from the clipboard." (interactive "P") - (setq tree (or tree (and kill-ring (current-kill 0)))) + (setq tree (or tree (current-kill 0))) (unless (org-kill-is-subtree-p tree)The main problem the old code solves is working around user error when kill-ring is empty. We do not really want to err in such cases; just handle empty kill ring specially.
From my point of view "kill ring is empty" user error clearly describes what happens in such case, so I do not see any point to spit suggestion to try simple yank instead.
I agree that (and kill-ring ...) condition misses the system clipboard. The proper way to handle this issue is explicitly catching "Kill ring is empty" error thrown by `current-kill' (i.e. `condition-case').
Why do you believe that just allowing to propagate this error is worse?
We have 3 occurrences of (and kill-ring (current-kill 0)) constructs in the code and may fix the problem either by replacing each instance with `condition-case' or we may create a separate macro/function in org-macs and use it.
Other cases (such as the one at the end of `org-paste-subtree' to determine if yanked text should be folded) require more care.
