Merge branch 'master' of github.com:hlissner/emacs.d

* 'master' of github.com:hlissner/emacs.d:
  Disable variable-pitch-mode in org-mode
This commit is contained in:
Henrik Lissner 2015-11-25 23:32:23 -05:00
commit 7d1428fc8e

View file

@ -212,6 +212,7 @@ will function properly."
(defface org-todo-vhigh '((t ())) "Face for very high-priority todo") (defface org-todo-vhigh '((t ())) "Face for very high-priority todo")
(defface org-whitespace '((t ())) "Face for spaces") (defface org-whitespace '((t ())) "Face for spaces")
(defface org-list-bullet '((t ())) "Face for list bullets") (defface org-list-bullet '((t ())) "Face for list bullets")
(defface org-todo-checkbox '((t ())) "Face for list bullets")
(font-lock-add-keywords (font-lock-add-keywords
'org-mode `(("^ *\\(#\\+begin_src\\>\\)" 'org-mode `(("^ *\\(#\\+begin_src\\>\\)"
(1 (narf/show-as ?#))) (1 (narf/show-as ?#)))
@ -225,9 +226,11 @@ will function properly."
;; Hide TODO tags ;; Hide TODO tags
("^\\**\\(\\* DONE\\) \\([^$\n\r]+\\)" ("^\\**\\(\\* DONE\\) \\([^$\n\r]+\\)"
(1 (narf/show-as ?☑)) (1 (narf/show-as ?☑))
(1 'org-todo-checkbox)
(2 'org-headline-done)) (2 'org-headline-done))
("^\\**\\(\\* TODO\\) \\([^$\n\r]+\\)?" ("^\\**\\(\\* TODO\\) \\([^$\n\r]+\\)?"
(1 (narf/show-as ?☐))) (1 (narf/show-as ?☐))
(1 'org-todo-checkbox))
;; Unbold-ify todos ;; Unbold-ify todos
(,(concat "^\\**\\(\\* " (,(concat "^\\**\\(\\* "
@ -235,12 +238,12 @@ will function properly."
"\\)\\( [^$\n\r]*\\)?") "\\)\\( [^$\n\r]*\\)?")
(2 'org-headline-todo)) (2 'org-headline-todo))
("[-+*] \\(\\[ \\]\\) " ;; ("[-+*] \\(\\[ \\]\\) "
(1 'org-whitespace)) ;; (1 'org-whitespace))
("[-+*] \\(\\[-\\]\\) " ;; ("[-+*] \\(\\[-\\]\\) "
(1 'org-whitespace)) ;; (1 'org-whitespace))
("[-+*] \\(\\[X\\]\\) \\([^$\n\r]+\\)" ("[-+*] \\(\\[X\\]\\) \\([^$\n\r]+\\)"
(1 'org-whitespace) ;; (1 'org-whitespace)
(2 'org-headline-done)) (2 'org-headline-done))
;; Show checkbox for other todo states (but don't hide the label) ;; Show checkbox for other todo states (but don't hide the label)
@ -254,8 +257,8 @@ will function properly."
(1 'org-list-bullet)) (1 'org-list-bullet))
("^ +\\(\\*\\) " ("^ +\\(\\*\\) "
(1 (narf/show-as ?◦))) (1 (narf/show-as ?◦)))
("^ +" ;; ("^ +"
(0 'org-whitespace)) ;; (0 'org-whitespace))
))) )))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -271,7 +274,6 @@ will function properly."
(narf|enable-tab-width-2) (narf|enable-tab-width-2)
(setq truncate-lines nil) (setq truncate-lines nil)
(setq line-spacing '0.2) (setq line-spacing '0.2)
(variable-pitch-mode 1)
(defun narf|org-update-statistics-cookies () (defun narf|org-update-statistics-cookies ()
(when (file-exists-p buffer-file-name) (when (file-exists-p buffer-file-name)