summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-20 13:29:49 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-20 13:29:49 +0100
commitd6729e3eda78b87968715ff53418c7be2f10fc11 (patch)
treef641359c41bf0c12442589eb7378b3efc4b11bc9
parentd378d9ec7ebf3a6f7b7b5e0ef7a264cd5815c022 (diff)
parentc2576f349b7bf27ca00d42c91f5067584c241378 (diff)
downloadorg-mode-d6729e3eda78b87968715ff53418c7be2f10fc11.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index a0308e0..f541a4c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -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))))