mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 19:37:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
6457a9e4e6
|
@ -22840,7 +22840,9 @@ depending on context."
|
||||||
org-ctrl-k-protect-subtree
|
org-ctrl-k-protect-subtree
|
||||||
(or (eq org-ctrl-k-protect-subtree 'error)
|
(or (eq org-ctrl-k-protect-subtree 'error)
|
||||||
(not (y-or-n-p "Kill hidden subtree along with headline? "))))
|
(not (y-or-n-p "Kill hidden subtree along with headline? "))))
|
||||||
(user-error "C-k aborted as it would kill a hidden subtree"))
|
(user-error
|
||||||
|
(substitute-command-keys
|
||||||
|
"`\\[org-kill-line]' aborted as it would kill a hidden subtree")))
|
||||||
(call-interactively
|
(call-interactively
|
||||||
(if (bound-and-true-p visual-line-mode) 'kill-visual-line 'kill-line)))
|
(if (bound-and-true-p visual-line-mode) 'kill-visual-line 'kill-line)))
|
||||||
((looking-at ".*?\\S-\\([ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)[ \t]*$")
|
((looking-at ".*?\\S-\\([ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)[ \t]*$")
|
||||||
|
|
Loading…
Reference in a new issue