From d278837240c2cd03bc3ac448b8fb40d8c0866c5c Mon Sep 17 00:00:00 2001 From: Cheong Yiu Fung Date: Wed, 21 Apr 2021 16:26:14 +0800 Subject: [PATCH 1/2] org.el (org-show-context-detail): add option 'ancestors-full * lisp/org.el: Add option 'ancestors-full to `org-show-context-detail', update `org-show-set-visibility' accordingly * testing/lisp/test-org.el: Add tests. --- lisp/org.el | 18 ++++++++++++------ testing/lisp/test-org.el | 4 ++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 675a614e2..80039c802 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1199,6 +1199,9 @@ Allowed visibility spans are ancestors show current headline and its direct ancestors; if point is not on headline, also show entry + ancestors-full show current headline, entry, subtree, current + headline's direct ancestors and their entries + lineage show current headline, its direct ancestors and all their children; if point is not on headline, also show entry and first child @@ -1240,6 +1243,7 @@ more context." (const minimal) (const local) (const ancestors) + (const ancestors-full) (const lineage) (const tree) (const canonical)))))) @@ -6758,9 +6762,9 @@ be shown." (defun org-show-set-visibility (detail) "Set visibility around point according to DETAIL. -DETAIL is either nil, `minimal', `local', `ancestors', `lineage', -`tree', `canonical' or t. See `org-show-context-detail' for more -information." +DETAIL is either nil, `minimal', `local', `ancestors', +`ancestors-full', `lineage', `tree', `canonical' or t. See +`org-show-context-detail' for more information." ;; Show current heading and possibly its entry, following headline ;; or all children. (if (and (org-at-heading-p) (not (eq detail 'local))) @@ -6775,18 +6779,20 @@ information." (org-with-limited-levels (cl-case detail ((tree canonical t) (org-show-children)) - ((nil minimal ancestors)) + ((nil minimal ancestors ancestors-full)) (t (save-excursion (outline-next-heading) (org-flag-heading nil))))))) + ;; Show whole subtree. + (when (eq detail 'ancestors-full) (org-show-subtree)) ;; Show all siblings. (when (eq detail 'lineage) (org-show-siblings)) ;; Show ancestors, possibly with their children. - (when (memq detail '(ancestors lineage tree canonical t)) + (when (memq detail '(ancestors ancestors-full lineage tree canonical t)) (save-excursion (while (org-up-heading-safe) (org-flag-heading nil) - (when (memq detail '(canonical t)) (org-show-entry)) + (when (memq detail '(ancestors-full canonical t)) (org-show-entry)) (when (memq detail '(tree canonical t)) (org-show-children)))))) (defvar org-reveal-start-hook nil diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index f6fb4b3ca..36658d51d 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -7982,6 +7982,10 @@ CLOCK: [2012-03-29 Thu 10:00]--[2012-03-29 Thu 16:40] => 6:40" (should (equal '(0 7 8 9) (funcall list-visible-lines 'local nil))) (should (equal '(0 3 7) (funcall list-visible-lines 'ancestors t))) (should (equal '(0 3 7 8) (funcall list-visible-lines 'ancestors nil))) + (should (equal '(0 3 4 7 8 9 10 11) + (funcall list-visible-lines 'ancestors-full t))) + (should (equal '(0 3 4 7 8 9 10 11) + (funcall list-visible-lines 'ancestors-full nil))) (should (equal '(0 3 5 7 12) (funcall list-visible-lines 'lineage t))) (should (equal '(0 3 5 7 8 9 12) (funcall list-visible-lines 'lineage nil))) (should (equal '(0 1 3 5 7 12 13) (funcall list-visible-lines 'tree t))) -- 2.31.1