Merge branch 'maint'

lisp/org.el

@@ -18080,19 +18080,17 @@ Move point to the beginning of first heading or end of buffer."
 (defun org-kill-note-or-show-branches ()
   "Abort storing current note, or show just branches."
   (interactive)
-  (if org-finish-function
-      (let ((org-note-abort t))
-        (funcall org-finish-function))
-    (if (org-before-first-heading-p)
-	(progn
-	  (org-show-branches-buffer)
-	  (org-hide-archived-subtrees (point-min) (point-max)))
-      (let ((beg (progn (outline-back-to-heading) (point)))
-	    (end (progn (outline-end-of-subtree) (point))))
-	(goto-char beg)
-	(outline-hide-subtree)
-	(outline-show-branches)
-	(org-hide-archived-subtrees beg end)))))
+  (cond (org-finish-function
+	 (let ((org-note-abort t)) (funcall org-finish-function)))
+	((org-before-first-heading-p)
+	 (org-show-branches-buffer)
+	 (org-hide-archived-subtrees (point-min) (point-max)))
+	(t
+	 (let ((beg (progn (org-back-to-heading) (point)))
+	       (end (save-excursion (org-end-of-subtree t t) (point))))
+	   (outline-hide-subtree)
+	   (outline-show-branches)
+	   (org-hide-archived-subtrees beg end)))))
 
 (defun org-delete-indentation (&optional arg)
   "Join current line to previous and fix whitespace at join.