From 9f4150541a27a6aeb9ab21535431d66b4fa1396e Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 21 Apr 2017 15:56:19 -0400
Subject: [PATCH] lang/org: disable pretty fontification by default, use
 +org-pretty-mode to toggle

---
 modules/app/present/config.el |  1 +
 modules/lang/org/config.el    | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/app/present/config.el b/modules/app/present/config.el
index 57db508fd..fd5794a4e 100644
--- a/modules/app/present/config.el
+++ b/modules/app/present/config.el
@@ -76,6 +76,7 @@
         (centered-window-mode arg)
         (window-divider-mode (* arg -1))
         (doom-hide-modeline-mode arg)
+        (+org-pretty-mode arg)
         (cond (org-tree-slide-mode
                (org-indent-mode -1)
                (text-scale-set +present-scale)
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index dbe2845ce..bb15f76d5 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -78,6 +78,14 @@
     :keymap (make-sparse-keymap)
     :group 'evil-org)
 
+  (define-minor-mode +org-pretty-mode
+    ""
+    :init-value nil
+    :lighter " *"
+    :group 'evil-org
+    (setq org-hide-emphasis-markers +org-pretty-mode)
+    (org-toggle-pretty-entities))
+
   (setq-default
    org-export-coding-system 'utf-8
 
@@ -95,12 +103,12 @@
    org-fontify-quote-and-verse-blocks t
    org-fontify-whole-heading-line t
    org-footnote-auto-label 'plain
-   org-hide-emphasis-markers t
+   org-hide-emphasis-markers nil
    org-hide-leading-stars t
    org-hide-leading-stars-before-indent-mode t
    org-image-actual-width nil
    org-indent-indentation-per-level 2
-   org-pretty-entities t
+   org-pretty-entities nil
    org-pretty-entities-include-sub-superscripts t
    org-startup-folded t
    org-startup-indented t
@@ -114,7 +122,7 @@
    org-completion-use-ido nil ; Use ivy/counsel for refiling
    org-confirm-elisp-link-function nil
    org-default-priority ?C
-   org-hidden-keywords '(title)
+   org-hidden-keywords nil
    org-hierarchical-todo-statistics t
    org-log-done t
    org-loop-over-headlines-in-active-region t