From d83d800de944fd30996908624714f4375baa4288 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 29 May 2017 01:22:47 +0200
Subject: [PATCH] Switch to fork of org-bullets

The source repo is no longer maintained, so I forked it, fixed a couple
problems (mainly, I made it respect org-hide) and am now using it in
DOOM.
---
 TODO.org                     |  3 ++-
 modules/lang/org/config.el   | 29 +----------------------------
 modules/lang/org/packages.el |  2 +-
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/TODO.org b/TODO.org
index c2bb5de45..db4e6cc61 100644
--- a/TODO.org
+++ b/TODO.org
@@ -92,7 +92,7 @@
     + [ ] twitter
     + [ ] present
 
-** 2.0.3 [54/82]
+** 2.0.3 [55/83]
 + [2/3] Finish module :: feature/jump (go-to-definition that just works)
   + [ ] automatic tag generation
   + [X] global tags support
@@ -133,6 +133,7 @@
 + [ ] Fix invisible buffer-info segment in modeline for terminal Emacs
 + [ ] ui/doom-modeline: fix ~0/0~ display in modeline (leftover anzu state)
 + [ ] lang/php: automatic+async rebuild of tags (phpctags)
++ [X] Replace org-bullets source with more up-to-date fork
 + [X] Extract ~mode-name~ setters to ~doom-ui-mode-names~ in core/core-ui
 + [X] nav-flash: blink on focus-in
 + [X] Add ~:textobj~ keyword to ~map!~
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 68ddcea80..6cebab2bb 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -386,32 +386,5 @@
     (when (derived-mode-p 'org-mode)
       (org-remove-occur-highlights)
       t))
-  (add-hook '+evil-esc-hook #'+org|remove-occur-highlights)
-
-  (after! org-bullets
-    (define-minor-mode org-bullets-mode
-      "Modified version of `org-bullets-mode' that respects the `org-hide' face."
-      nil nil nil
-      (let* ((keyword
-              `((,org-outline-regexp-bol
-                 (0 (let ((level (- (match-end 0) (match-beginning 0) 1)))
-                      (compose-region (- (match-end 0) 2)
-                                      (- (match-end 0) 1)
-                                      (org-bullets-level-char level))
-                      (when (facep org-bullets-face-name)
-                        (put-text-property (- (match-end 0) 2)
-                                           (- (match-end 0) 1)
-                                           'face org-bullets-face-name))
-                      (put-text-property (match-beginning 0) (match-end 0)
-                                         'keymap org-bullets-bullet-map)
-                      nil))))))
-        (if org-bullets-mode
-            (progn (font-lock-add-keywords nil keyword)
-                   (font-lock-fontify-buffer))
-          (save-excursion
-            (goto-char (point-min))
-            (font-lock-remove-keywords nil keyword)
-            (while (re-search-forward org-outline-regexp-bol nil t)
-              (decompose-region (match-beginning 0) (match-end 0)))
-            (font-lock-fontify-buffer)))))))
+  (add-hook '+evil-esc-hook #'+org|remove-occur-highlights))
 
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index f9706f892..1bb90700f 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -8,7 +8,7 @@
 (package! org-plus-contrib :recipe (:fetcher git :url "http://orgmode.org/org-mode.git"))
 
 (package! org-download)
-(package! org-bullets)
+(package! org-bullets :recipe (:fetcher github :repo "hlissner/org-bullets"))
 (package! toc-org)
 (package! ob-go)
 (package! ob-mongo)