about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el24
1 files changed, 17 insertions, 7 deletions
diff --git a/init.el b/init.el index b5b4641..7ea94dc 100644 --- a/init.el +++ b/init.el
@@ -544,8 +544,7 @@
544 (setq load-path (cl-remove-if (lambda (path) 544 (setq load-path (cl-remove-if (lambda (path)
545 (string-match-p "lisp/org\\'" path)) 545 (string-match-p "lisp/org\\'" path))
546 load-path)) 546 load-path))
547 (:also-load +org 547 (:also-load +org)
548 _work)
549 (:option org-adapt-indentation nil 548 (:option org-adapt-indentation nil
550 org-archive-mark-done t 549 org-archive-mark-done t
551 org-catch-invisible-edits 'show-and-error 550 org-catch-invisible-edits 'show-and-error
@@ -568,8 +567,11 @@
568 org-image-actual-width (list (* (window-font-width) 567 org-image-actual-width (list (* (window-font-width)
569 (- fill-column 8))) 568 (- fill-column 8)))
570 org-imenu-depth 3 569 org-imenu-depth 3
570 org-indent-indentation-per-level 0
571 org-indent-mode-turns-on-hiding-stars nil
571 org-list-demote-modify-bullet '(("-" . "+") 572 org-list-demote-modify-bullet '(("-" . "+")
572 ("+" . "-")) 573 ("+" . "*")
574 ("*" . "-"))
573 org-log-done 'time 575 org-log-done 'time
574 org-log-into-drawer t 576 org-log-into-drawer t
575 org-num-skip-commented t 577 org-num-skip-commented t
@@ -635,10 +637,18 @@
635 ;; NOTE: these `progn' and `default's are necessary; otherwise Emacs 637 ;; NOTE: these `progn' and `default's are necessary; otherwise Emacs
636 ;; complains about "Invalid face reference: t" in org-mode buffers, because 638 ;; complains about "Invalid face reference: t" in org-mode buffers, because
637 ;; `compose-region' returns t. 639 ;; `compose-region' returns t.
638 ("^ *\\([-]\\) " 640 ("^[ \t]*\\([-]\\) "
639 (0 (progn (compose-region (match-beginning 1) (match-end 1) "›") 'default))) 641 (0 (progn (compose-region (match-beginning 1) (match-end 1) "–") 'fixed-pitch)))
640 ("^ *\\([+]\\) " 642 ("^[ \t]*\\([+]\\) "
641 (0 (progn (compose-region (match-beginning 1) (match-end 1) "»") 'default))))) 643 (0 (progn (compose-region (match-beginning 1) (match-end 1) "¬") 'fixed-pitch)))
644 ("^[ \t]+\\([*]\\) "
645 (0 (progn (compose-region (match-beginning 1) (match-end 1) "→") 'fixed-pitch)))
646 ;; Fancy numbered lists (well, monospaced)
647 ("^[ \t]*\\(\\(?:[0-9]+\\|[A-Za-z]\\)[.)]\\) " 0 'fixed-pitch t)))
648 ;; Make nobreak-space fixed-pitch as well, for better alignment (is this the
649 ;; best way to do this? probably not!)
650 (:face org-indent ((t (:inherit (fixed-pitch))))
651 nobreak-space ((t (:inherit (fixed-pitch)))))
642 (with-eval-after-load 'form-feed 652 (with-eval-after-load 'form-feed
643 ;; Horizontal lines 653 ;; Horizontal lines
644 (font-lock-add-keywords 654 (font-lock-add-keywords