lang/org: general clean up + fix Tab in src blocks

This commit is contained in:
Henrik Lissner 2017-04-11 08:30:09 -04:00
parent 3a3ae6ff5c
commit 78eb9b888c
2 changed files with 5 additions and 9 deletions

View file

@ -23,6 +23,8 @@
(org-indent-item-tree)) (org-indent-item-tree))
((org-at-heading-p) ((org-at-heading-p)
(ignore-errors (org-demote))) (ignore-errors (org-demote)))
((org-in-src-block-p t)
(doom/dumb-indent))
(t (call-interactively 'self-insert-command)))) (t (call-interactively 'self-insert-command))))
;;;###autoload ;;;###autoload

View file

@ -26,10 +26,6 @@
(defvar +org-attachment-dir ".attach/" (defvar +org-attachment-dir ".attach/"
"Where to store attachments (relative to current org file).") "Where to store attachments (relative to current org file).")
;; (defvar-local +org-attachments-list '()
;; "A list of attachments for the current buffer. This is so my custom attachment
;; system can keep track of each buffer's attachments.")
;; Ensure ELPA org is prioritized above built-in org. ;; Ensure ELPA org is prioritized above built-in org.
(when-let (path (locate-library "org" nil doom--package-load-path)) (when-let (path (locate-library "org" nil doom--package-load-path))
(push (file-name-directory path) load-path)) (push (file-name-directory path) load-path))
@ -92,7 +88,7 @@
org-blank-before-new-entry '((heading . nil) (plain-list-item . auto)) org-blank-before-new-entry '((heading . nil) (plain-list-item . auto))
org-cycle-separator-lines 1 org-cycle-separator-lines 1
org-cycle-include-plain-lists t org-cycle-include-plain-lists t
org-ellipsis '+doom-folded-face org-ellipsis " ... "
org-entities-user '(("flat" "\\flat" nil "" "" "266D" "") org-entities-user '(("flat" "\\flat" nil "" "" "266D" "")
("sharp" "\\sharp" nil "" "" "266F" "")) ("sharp" "\\sharp" nil "" "" "266F" ""))
org-fontify-done-headline t org-fontify-done-headline t
@ -176,10 +172,8 @@
'((t (:inherit font-lock-keyword-face))) '((t (:inherit font-lock-keyword-face)))
"Face for list bullets") "Face for list bullets")
(font-lock-add-keywords (font-lock-add-keywords
'org-mode '(("^ *\\([-+]\\|[0-9]+[).]\\) " 'org-mode '(("^ *\\([-+]\\|[0-9]+[).]\\) " (1 'org-list-bullet))
(1 'org-list-bullet)) ("^ *\\(-----+\\)$" (1 'org-meta-line))))
("^ *\\(-----+\\)$"
(1 'org-meta-line))))
;; Enable gpg support ;; Enable gpg support
(require 'epa-file) (require 'epa-file)