dir-locals.el: Don't set variables for non-programming modes

This limits the style changes to modes inherited from prog-mode. The
main reason to do this is to avoid setting fill-column for people
using Emacs to edit commit messages because 78 characters is too many
to make it wrap properly in git log. Note that makefile-mode also
inherits from prog-mode so the fill column should continue to apply
there.

v2: Apply to all the .dir-locals.el files, not just the one in the
    root directory.

Acked-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/.dir-locals.el b/.dir-locals.el
index 04a1a2ce6482b9894647d531563db4f75312b627..d95eb4803f6ba5b6d5968e16451dcbf84deaa10c 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . nil)
   (tab-width . 8)
   (c-basic-offset . 3)

diff --git a/src/gallium/drivers/freedreno/.dir-locals.el b/src/gallium/drivers/freedreno/.dir-locals.el
index c26578bbf4bb2d5c48064e6565915a263ba02221..aa20d495465ab92a304648a9be521ceb30202d08 100644 (file)
--- a/src/gallium/drivers/freedreno/.dir-locals.el
+++ b/src/gallium/drivers/freedreno/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . true)
   (tab-width . 4)
   (c-basic-offset . 4)

diff --git a/src/gallium/drivers/r600/.dir-locals.el b/src/gallium/drivers/r600/.dir-locals.el
index 8be6a30ac67fd15952d96131ee9742c9742cdb45..4e35c129e705fda3ffc7fb14187367fd7b6cafb9 100644 (file)
--- a/src/gallium/drivers/r600/.dir-locals.el
+++ b/src/gallium/drivers/r600/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . true)
   (tab-width . 8)
   (c-basic-offset . 8)

diff --git a/src/gallium/drivers/radeon/.dir-locals.el b/src/gallium/drivers/radeon/.dir-locals.el
index 8be6a30ac67fd15952d96131ee9742c9742cdb45..4e35c129e705fda3ffc7fb14187367fd7b6cafb9 100644 (file)
--- a/src/gallium/drivers/radeon/.dir-locals.el
+++ b/src/gallium/drivers/radeon/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . true)
   (tab-width . 8)
   (c-basic-offset . 8)

diff --git a/src/gallium/drivers/radeonsi/.dir-locals.el b/src/gallium/drivers/radeonsi/.dir-locals.el
index 8be6a30ac67fd15952d96131ee9742c9742cdb45..4e35c129e705fda3ffc7fb14187367fd7b6cafb9 100644 (file)
--- a/src/gallium/drivers/radeonsi/.dir-locals.el
+++ b/src/gallium/drivers/radeonsi/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . true)
   (tab-width . 8)
   (c-basic-offset . 8)

diff --git a/src/gallium/drivers/vc4/.dir-locals.el b/src/gallium/drivers/vc4/.dir-locals.el
index ed10dc2d7fee75364087677acc4c5e3e2d212f91..ac94242d70f94af1dcf9cf2ae71264c7db441a4c 100644 (file)
--- a/src/gallium/drivers/vc4/.dir-locals.el
+++ b/src/gallium/drivers/vc4/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . nil)
   (tab-width . 8)
   (c-basic-offset . 8)

diff --git a/src/gallium/drivers/vc4/kernel/.dir-locals.el b/src/gallium/drivers/vc4/kernel/.dir-locals.el
index 2e58e90f311ec71028d071624405e996cca3c501..49403de24682fe95501280e42b32bca7b964c7e5 100644 (file)
--- a/src/gallium/drivers/vc4/kernel/.dir-locals.el
+++ b/src/gallium/drivers/vc4/kernel/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . t)
   (tab-width . 8)
   (c-basic-offset . 8)

diff --git a/src/gallium/winsys/radeon/.dir-locals.el b/src/gallium/winsys/radeon/.dir-locals.el
index 0e937bba36b7787ec332295d6a76fa79bb91a998..d5f0f0433261b3d7180e8072bbd4361ef35c7206 100644 (file)
--- a/src/gallium/winsys/radeon/.dir-locals.el
+++ b/src/gallium/winsys/radeon/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . nil)
   (tab-width . 8)
   (c-basic-offset . 4)

diff --git a/src/mesa/drivers/dri/nouveau/.dir-locals.el b/src/mesa/drivers/dri/nouveau/.dir-locals.el
index 29735e8f24ab45ab287759dc0f60c70dd551b97c..774f023ae6f15f3fdbe523cdcf38f52240d4bfce 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/.dir-locals.el
+++ b/src/mesa/drivers/dri/nouveau/.dir-locals.el
@@ -1,4 +1,4 @@
-((nil
+((prog-mode
   (indent-tabs-mode . true)
   (tab-width . 8)
   (c-basic-offset . 8)