Change the dang ol' org font stuff

1 files changed, 13 insertions, 3 deletions

@@ -574,7 +574,13 @@
            org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)"
                                          "|" "DONE(d!)")
                                (sequence "|" "CANCELED(k@)")
-                               (sequence "MEETING(m)")))
+                               (sequence "MEETING(m)"))
+           org-emphasis-alist '(("*" org-bold)
+                                ("/" org-italic)
+                                ("_" org-underline)
+                                ("=" org-verbatim)
+                                ("~" org-code)
+                                ("+" org-strikethrough)))
   (:bind "RET" #'+org-return-dwim
          "<S-return>" #'+org-table-copy-down
          "C-c C-l" #'+org-insert-link-dwim
@@ -583,6 +589,7 @@
          "C-c C-o" #'+org-open-at-point-dwim
          "`" #'+org-insert-tilde
          "~" #'+org-insert-backtick)
+  (:hook #'variable-pitch-mode)
   (:local-hook user-save-hook #'+org-before-save@prettify-buffer)
   (advice-add #'org-delete-backward-char :override #'+org-delete-backward-char)
   ;; (define-advice org-open-at-point (:around (fn &rest r) open-external)
@@ -601,10 +608,13 @@
   (font-lock-add-keywords
    'org-mode
    '(;; Fancy list bullets
+     ;; NOTE: these `progn' and `default's are necessary; otherwise Emacs
+     ;; complains about "Invalid face reference: t" in org-mode buffers, because
+     ;; `compose-region' returns t.
      ("^ *\\([-]\\) "
-      (0 (compose-region (match-beginning 1) (match-end 1) "•")))
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "∙") 'default)))
      ("^ *\\([+]\\) "
-      (0 (compose-region (match-beginning 1) (match-end 1) "â—¦")))))
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "â—¦") 'default)))))
   (with-eval-after-load 'form-feed
     ;; Horizontal lines
     (font-lock-add-keywords