[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/org-tree-slide 933d6dc6e5 079/144: Merge pull request #14
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/org-tree-slide 933d6dc6e5 079/144: Merge pull request #14 from bennati/display-tree-with-narrow |
Date: |
Tue, 18 Jan 2022 08:59:41 -0500 (EST) |
branch: elpa/org-tree-slide
commit 933d6dc6e52ca052ceaa8c4b28c069ee8d8aaee8
Merge: 362bea826d 3927af91ba
Author: Takaaki ISHIKAWA <takaxp@ieee.org>
Commit: Takaaki ISHIKAWA <takaxp@ieee.org>
Merge pull request #14 from bennati/display-tree-with-narrow
Heading visibility depends on the value of org-tree-slide-skip-outline-level
---
org-tree-slide.el | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/org-tree-slide.el b/org-tree-slide.el
index 63d3ef9532..f5d0a65137 100644
--- a/org-tree-slide.el
+++ b/org-tree-slide.el
@@ -520,16 +520,18 @@ Profiles:
(defun org-tree-slide--display-tree-with-narrow ()
"Show a tree with narrowing and also set a header at the head of slide."
(run-hooks 'org-tree-slide-mode-before-narrow-hook)
- (run-hooks 'org-tree-slide-before-narrow-hook)
+ (run-hooks 'org-tree-slide-before-narrow-hook)
(when (equal org-tree-slide-modeline-display 'outside)
(setq org-tree-slide--slide-number
- (format " %s" (org-tree-slide--count-slide (point))))
+ (format " %s" (org-tree-slide--count-slide (point))))
(setq org-tree-slide--previous-line (org-tree-slide--line-number-at-pos)))
(goto-char (point-at-bol))
(unless (org-tree-slide--before-first-heading-p)
(hide-subtree) ; support CONTENT (subtrees are shown)
(org-show-entry)
- (show-children)
+ (if (org-tree-slide--heading-level-skip-level-p (1+ (org-outline-level)))
;if this is the last level to be displayed, show the full content
+ (show-all)
+ (show-children))
;; (org-cycle-hide-drawers 'all) ; disabled due to performance reduction
(org-narrow-to-subtree))
(when org-tree-slide-slide-in-effect
@@ -579,19 +581,22 @@ Profiles:
*** hoge ; nil
"
(or (or (org-tree-slide--heading-done-skip-p)
- (org-tree-slide--heading-level-skip-p))
+ (org-tree-slide--heading-level-skip-p))
(org-tree-slide--heading-skip-comment-p)))
-(defun org-tree-slide--heading-level-skip-p ()
+(defun org-tree-slide--heading-level-skip-level-p (level)
(and (> org-tree-slide-skip-outline-level 0)
- (<= org-tree-slide-skip-outline-level (org-outline-level))))
+ (<= org-tree-slide-skip-outline-level level)))
+
+(defun org-tree-slide--heading-level-skip-p ()
+ (org-tree-slide--heading-level-skip-level-p (org-outline-level)))
(defun org-tree-slide--heading-done-skip-p ()
(and org-tree-slide-skip-done
(not
- (looking-at
- ;; 6.33x does NOT suport org-outline-regexp-bol
- (concat "^\\*+ " org-not-done-regexp)))))
+ (looking-at
+ ;; 6.33x does NOT suport org-outline-regexp-bol
+ (concat "^\\*+ " org-not-done-regexp)))))
(defun org-tree-slide--heading-skip-comment-p ()
(and org-tree-slide-skip-comments
- [nongnu] elpa/org-tree-slide faf9421439 041/144: Update README, (continued)
- [nongnu] elpa/org-tree-slide faf9421439 041/144: Update README, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 5d4f714052 020/144: Change descriptions, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide e835028d43 051/144: Fix README.org, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 09e99877d7 045/144: Fix a bug for an org buffer without header, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 949c77146f 025/144: org-tree-slide-skip-done set nil as default, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 28975a4492 018/144: Support displaying a slide number in a mode-line., ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 996ed8cc6b 058/144: * README.org: update as el-get has recipe already included., ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide a3531738a8 059/144: Merge pull request #3 from yyr/master, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 6cf6e4ee84 065/144: Support buffers without headings, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 8e2ab19663 072/144: Default keymap was changed, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 933d6dc6e5 079/144: Merge pull request #14 from bennati/display-tree-with-narrow,
ELPA Syncer <=
- [nongnu] elpa/org-tree-slide dff8f1a4a6 094/144: Added a hook for CONTENT viewing mode, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 20784de420 103/144: Update ChangeLog, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 508157fb21 104/144: Avoid max-lisp-eval-depth error #29, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide aa2140f62b 126/144: Create custom variable org-tree-slide-content-margin-top, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide c9487e51b0 133/144: Add some links to useful videos, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 27f8bb6a96 140/144: Merge branch 'master' of github.com:takaxp/org-tree-slide, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide a9dcef402a 128/144: Update the docstring of org-tree-slide-content-margin-top variable, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 917612a0d1 142/144: Merge pull request #47 from jypma/allow-empty-date-author, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 9da1d00777 141/144: Allow empty date and author to save on-screen space, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 8c301414bb 060/144: Remove brackets in title, ELPA Syncer, 2022/01/18