Merge branch 'maint'
This commit is contained in:
commit
d6729e3eda
|
@ -20341,9 +20341,12 @@ Use `\\[org-edit-special]' to edit table.el tables"))
|
|||
"Abort storing current note, or call `outline-show-branches'."
|
||||
(interactive)
|
||||
(if (not org-finish-function)
|
||||
(progn
|
||||
(outline-hide-subtree)
|
||||
(call-interactively 'outline-show-branches))
|
||||
(save-excursion
|
||||
(save-restriction
|
||||
(org-narrow-to-subtree)
|
||||
(org-flag-subtree t)
|
||||
(call-interactively 'outline-show-branches)
|
||||
(org-hide-archived-subtrees (point-min) (point-max))))
|
||||
(let ((org-note-abort t))
|
||||
(funcall org-finish-function))))
|
||||
|
||||
|
|
Loading…
Reference in New Issue