tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Small refactoring 

* lisp/org.el (org-kill-note-or-show-branches): Prefer `org' functions
over `outline' ones.  Use `cond' instead of nested `if'.
This commit is contained in:
Nicolas Goaziou 2019-12-31 16:55:48 +01:00
parent 524ccf3adb
commit f37ae5e56a
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lisp/org.el
View File

@ -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.