From f37ae5e56a4d26372fff878f47af4516901c967f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 31 Dec 2019 16:55:48 +0100 Subject: [PATCH] Small refactoring * lisp/org.el (org-kill-note-or-show-branches): Prefer `org' functions over `outline' ones. Use `cond' instead of nested `if'. --- lisp/org.el | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 0d709d0bf..70e3d29b8 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18008,19 +18008,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.