Don't use dir-settings and keep dir-locals in sync with org-mode.git

.dir-locals.el

@@ -1,9 +1,11 @@
-;; - keep in sync dir-locals.el (for Emacs >= 24) with .dir-settings.el
-;;   (for Emacs < 24)
-;; - don't use a symbolic link to prevent problems on cygwin
-;;   distributions (commit 971b9eeacd38959439ddaa7c650430cc2dcb673e)
+((nil
+  (indent-tabs-mode . t)
+  (tab-width . 8)
+  (fill-column . 70)
+  (sentence-end-double-space . t))
+ (org-mode
+  (indent-tabs-mode)
+  (org-edit-src-content-indentation . 0)
+  (org-adapt-indentation)
+  (org-list-description-max-indent . 5)))
 
-((nil . ((indent-tabs-mode . t)
-	 (tab-width . 8)
-	 (fill-column . 70)
-	 (sentence-end-double-space . t))))

.dir-settings.el

@@ -1,9 +0,0 @@
-;; - keep in sync dir-locals.el (for Emacs >= 24) with .dir-settings.el
-;;   (for Emacs < 24)
-;; - don't use a symbolic link to prevent problems on cygwin
-;;   distributions (commit 971b9eeacd38959439ddaa7c650430cc2dcb673e)
-
-((nil . ((indent-tabs-mode . t)
-	 (tab-width . 8)
-	 (fill-column . 70)
-	 (sentence-end-double-space . t))))