From 5f60c6e461063ff27beb5aac7d895d51078a85f5 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Tue, 22 Nov 2011 18:35:41 +0000 Subject: [PATCH] Fix .dir-locals.el to only apply to specific modes https://bugs.webkit.org/show_bug.cgi?id=72963 Patch by Andy Wingo 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 --- .dir-locals.el | 5 +---- ChangeLog | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 229a8a2bbf30..3a2b6aa70c28 100644 --- 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 8ad93d399c16..0f61ec70d41d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-11-22 Andy Wingo + + 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 Add GYP-generated WTF.xcodeproj to .gitignore after r100851. -- 2.36.0