[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/org-tree-slide 27f8bb6a96 140/144: Merge branch 'master' o
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/org-tree-slide 27f8bb6a96 140/144: Merge branch 'master' of github.com:takaxp/org-tree-slide |
Date: |
Tue, 18 Jan 2022 08:59:56 -0500 (EST) |
branch: elpa/org-tree-slide
commit 27f8bb6a9676e1c0b500e75799e3b5c37a9156af
Merge: b1ba1189f1 571ff33308
Author: Takaaki ISHIKAWA <takaxp@ieee.org>
Commit: Takaaki ISHIKAWA <takaxp@ieee.org>
Merge branch 'master' of github.com:takaxp/org-tree-slide
---
org-tree-slide.el | 62 ++++++++++++++++++++++---------------------------------
1 file changed, 25 insertions(+), 37 deletions(-)
diff --git a/org-tree-slide.el b/org-tree-slide.el
index 90f490eacf..e035b5c008 100644
--- a/org-tree-slide.el
+++ b/org-tree-slide.el
@@ -200,45 +200,30 @@ If you want to show anything, just specify nil."
map)
"The keymap for `org-tree-slide'.")
-(defface org-tree-slide-heading-level-1-init
- '((t (:inherit outline-1)))
+(defcustom org-tree-slide-heading-level-1
+ '(outline-1 :height 1.5 bold)
"Level 1."
:group 'org-tree-slide)
-(defface org-tree-slide-heading-level-2-init
- '((t (:inherit outline-2)))
+(defcustom org-tree-slide-heading-level-2
+ '(outline-2 :height 1.4 bold)
"Level 2."
:group 'org-tree-slide)
-(defface org-tree-slide-heading-level-3-init
- '((t (:inherit outline-3)))
+(defcustom org-tree-slide-heading-level-3
+ '(outline-3 :height 1.3 bold)
"Level 3."
:group 'org-tree-slide)
-(defface org-tree-slide-heading-level-4-init
- '((t (:inherit outline-4)))
+(defcustom org-tree-slide-heading-level-4
+ '(outline-4 :height 1.2 bold)
"Level 4."
:group 'org-tree-slide)
-(defface org-tree-slide-heading-level-1
- '((t (:inherit outline-1 :height 1.5 :bold t)))
- "Level 1."
- :group 'org-tree-slide)
-
-(defface org-tree-slide-heading-level-2
- '((t (:inherit outline-2 :height 1.4 :bold t)))
- "Level 2."
- :group 'org-tree-slide)
-
-(defface org-tree-slide-heading-level-3
- '((t (:inherit outline-3 :height 1.3 :bold t)))
- "Level 3."
- :group 'org-tree-slide)
-
-(defface org-tree-slide-heading-level-4
- '((t (:inherit outline-4 :height 1.2 :bold t)))
- "Level 4."
- :group 'org-tree-slide)
+(defvar-local org-tree-slide-heading-level-1-cookie nil)
+(defvar-local org-tree-slide-heading-level-2-cookie nil)
+(defvar-local org-tree-slide-heading-level-3-cookie nil)
+(defvar-local org-tree-slide-heading-level-4-cookie nil)
(defvar org-tree-slide-mode nil)
(defvar org-tree-slide-play-hook nil
@@ -858,17 +843,20 @@ Otherwise, return the point. This doesn't check whether
skipping or not."
(unless org-tree-slide-never-touch-face
(cond
(status
- (custom-set-faces
- '(org-level-1 ((t (:inherit org-tree-slide-heading-level-1))))
- '(org-level-2 ((t (:inherit org-tree-slide-heading-level-2))))
- '(org-level-3 ((t (:inherit org-tree-slide-heading-level-3))))
- '(org-level-4 ((t (:inherit org-tree-slide-heading-level-4))))))
+ (setq
+ org-tree-slide-heading-level-1-cookie
+ (face-remap-add-relative 'org-level-1 org-tree-slide-heading-level-1)
+ org-tree-slide-heading-level-2-cookie
+ (face-remap-add-relative 'org-level-2 org-tree-slide-heading-level-2)
+ org-tree-slide-heading-level-3-cookie
+ (face-remap-add-relative 'org-level-3 org-tree-slide-heading-level-3)
+ org-tree-slide-heading-level-4-cookie
+ (face-remap-add-relative 'org-level-4 org-tree-slide-heading-level-4)))
(t
- (custom-set-faces
- '(org-level-1 ((t (:inherit org-tree-slide-heading-level-1-init))))
- '(org-level-2 ((t (:inherit org-tree-slide-heading-level-2-init))))
- '(org-level-3 ((t (:inherit org-tree-slide-heading-level-3-init))))
- '(org-level-4 ((t (:inherit org-tree-slide-heading-level-4-init)))))))))
+ (face-remap-remove-relative org-tree-slide-heading-level-1-cookie)
+ (face-remap-remove-relative org-tree-slide-heading-level-2-cookie)
+ (face-remap-remove-relative org-tree-slide-heading-level-3-cookie)
+ (face-remap-remove-relative org-tree-slide-heading-level-4-cookie)))))
(defun org-tree-slide--count-slide (&optional pos)
"Return formatted the slide number. If POS is nil, `point' will be used."
- [nongnu] elpa/org-tree-slide 996ed8cc6b 058/144: * README.org: update as el-get has recipe already included., (continued)
- [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, 2022/01/18
- [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 <=
- [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
- [nongnu] elpa/org-tree-slide 0ef103eb14 087/144: Merge pull request #19 from kaushalmodi/lighter-defvar-plus-typo-fixes, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 403f5c002e 086/144: Add a defvar for lighter and minor typo fixes, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide fed7ec7e6d 093/144: Added breadcrumbs feature (by Matus), ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 16007b48c6 108/144: Refine skipping slide algorithm, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide 7bf09a02bd 114/144: Merge pull request #31 from ndw/slide-date, ELPA Syncer, 2022/01/18
- [nongnu] elpa/org-tree-slide a041b92c14 115/144: Add demo, ELPA Syncer, 2022/01/18