1 files changed, 14 insertions, 1 deletions

diff --git a/emacs b/emacs
index 408ea6d..a653a60 100644
--- a/emacs
+++ b/emacs
@@ -345,6 +345,19 @@ If this is set during find-file, flyspell mode gets enabled automaticaly.")
   (add-hook 'js-mode-hook
           (lambda () (flymake-mode t))))
 
+;; org-mode
+(when (require 'org nil 'noerror)
+  (progn
+    (setq org-todo-keywords
+        '((sequence "TODO(t)" "PROGRESS(p!)" "WAIT(w@/!)" "|"
+                    "CANCELED(c@/!)" "DONE(d!)")))
+
+    (setq org-todo-keyword-faces
+          '(("TODO" . org-warning) ("PROGRESS" . "yellow")
+            ("CANCELED" . (:foreground "blue" :weight bold))))
+    (setq org-startup-folded 'content)
+    (setq org-startup-indented t)))
+
 ;; promela-mode
 (when (require 'promela-mode nil 'noerror)
   (setq auto-mode-alist
@@ -381,4 +394,4 @@ If this is set during find-file, flyspell mode gets enabled automaticaly.")
    (setq deft-extension "org"
          deft-directory "~/.org/deft/"
          deft-text-mode 'org-mode)
-   (global-set-key (kbd "<f9>") 'deft))
\ No newline at end of file
+   (global-set-key (kbd "<f9>") 'deft))