branch: elpa/org-tree-slide
commit c9c413ba8bce3290baa9607356a1aafa2e7dd894
Author: Takaaki ISHIKAWA <tak...@ieee.org>
Commit: Takaaki ISHIKAWA <tak...@ieee.org>
Added a flag to control face setting
---
ChangeLog | 3 +++
README.org | 3 ++-
org-tree-slide.el | 29 ++++++++++++++++++-----------
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5d6028ace6..af11a7f0b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2013-02-19 Takaaki ISHIKAWA <ta...@ieee.org>
+ * org-tree-slide.el (org-tree-slide-never-touch-face): Added a flag
+ If this flag is `t', face settings wil NOT be touched.
+
* org-tree-slide.el: support all trees are skipped
- ots-move-to-the-first-heading
- ots-all-skipped, as a flag
diff --git a/README.org b/README.org
index 030571ea27..ff4ba97d30 100644
--- a/README.org
+++ b/README.org
@@ -2,7 +2,7 @@
#+AUTHOR: Takaaki Ishikawa
#+EMAIL: tak...@ieee.org
#+STARTUP: content
-#+Last Update: 2013-02-19@12:15
+#+Last Update: 2013-02-19@12:50
* 1. What's this?
@@ -218,6 +218,7 @@ see also ChangeLog
|---------+------------------+-------------------------------------------------|
| Version | Date | Description
|
|---------+------------------+-------------------------------------------------|
+| v2.6.8 | 2013-02-19@12:49 | Added a flag to control face setting
|
| v2.6.6 | 2013-02-19@11:22 | Added a new toggle to skip commented trees
|
| v2.6.4 | 2013-02-12@01:43 | Added some features (issue #2, #5, and #7)
|
| v2.6.2 | 2013-01-27@21:21 | Added hooks for start and stop the presentation
|
diff --git a/org-tree-slide.el b/org-tree-slide.el
index c4439b5062..51a283c0c6 100644
--- a/org-tree-slide.el
+++ b/org-tree-slide.el
@@ -67,7 +67,7 @@
(require 'org-timer)
(require 'org-clock) ; org-clock-in, -out, -clocking-p
-(defconst org-tree-slide "2.6.6"
+(defconst org-tree-slide "2.6.8"
"The version number of the org-tree-slide.el")
(defgroup org-tree-slide nil
@@ -119,6 +119,11 @@
:type 'boolean
:group 'org-tree-slide)
+(defcustom org-tree-slide-never-touch-face nil
+ "If t, do NOT touch any face setting."
+ :type 'boolean
+ :group 'org-tree-slide)
+
(defcustom org-tree-slide-skip-done nil
"Specify to show TODO item only or not."
:type 'boolean
@@ -469,7 +474,8 @@ Profiles:
(t nil)))
(ots-hide-slide-header)
(org-timer-stop)
- (ots-apply-custom-heading-face nil)
+ (when org-tree-slide-heading-emphasis
+ (ots-apply-custom-heading-face nil))
(when (and org-tree-slide-skip-done
(looking-at (concat "^\\*+ " org-not-done-regexp)))
(when (org-clocking-p)
@@ -658,15 +664,16 @@ Profiles:
(defun ots-apply-custom-heading-face (status)
"Change status of heading face."
- (cond (status
- (custom-set-faces
- '(org-level-2 ((t (:inherit org-tree-slide-heading-level-2))))
- '(org-level-3 ((t (:inherit org-tree-slide-heading-level-3))))))
- (t
- (custom-set-faces
- '(org-level-2 ((t (:inherit org-tree-slide-heading-level-2-init))))
- '(org-level-3 ((t (:inherit org-tree-slide-heading-level-3-init)))))
- )))
+ (unless org-tree-slide-never-touch-face
+ (cond (status
+ (custom-set-faces
+ '(org-level-2 ((t (:inherit org-tree-slide-heading-level-2))))
+ '(org-level-3 ((t (:inherit org-tree-slide-heading-level-3))))))
+ (t
+ (custom-set-faces
+ '(org-level-2 ((t (:inherit org-tree-slide-heading-level-2-init))))
+ '(org-level-3 ((t (:inherit org-tree-slide-heading-level-3-init)))))
+ ))))
(defun ots-count-slide (target-point)
(save-excursion
