Fix .dir-locals.el to only apply to specific modes

https://bugs.webkit.org/show_bug.cgi?id=72963

Patch by Andy Wingo <wingo@igalia.com> on 2011-11-22
Reviewed by Xan Lopez.

* .dir-locals.el: Remove `nil' block, as it was causing
makefile-mode not to insert tabs.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101013 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.dir-locals.el b/.dir-locals.el
index 229a8a2bbf302d8182fa9975522ec107b8b42401..3a2b6aa70c28b5ebad3a852ada5e0a826803993b 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,10 +2,7 @@
 
 ;; Syntax: ((MODE (VAR . VAL) ...) ...)
 ;; MODE is a symbol like `c-mode', or `nil' for all modes.
-((nil
-  (indent-tabs-mode . nil)
-  (c-basic-offset . 4))
- (c-mode
+((c-mode
   (indent-tabs-mode . nil)
   (c-basic-offset . 4))
  (c++-mode

diff --git a/ChangeLog b/ChangeLog
index 8ad93d399c16bf17c161670b7a22ff02f94253ed..0f61ec70d41d3bf7bdf6cced50ae884299ea874f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-22  Andy Wingo  <wingo@igalia.com>
+
+        Fix .dir-locals.el to only apply to specific modes
+        https://bugs.webkit.org/show_bug.cgi?id=72963
+
+        Reviewed by Xan Lopez.
+
+        * .dir-locals.el: Remove `nil' block, as it was causing
+        makefile-mode not to insert tabs.
+
 2011-11-21  Adam Klein  <adamk@chromium.org>
 
         Add GYP-generated WTF.xcodeproj to .gitignore after r100851.