[Mesa-dev] [PATCH] dir-locals.el: use appropriate c-file-style

[Ilia Mirkin]

What's the difference between c-file-style linux and stroustrup?

On Mon, Mar 6, 2017 at 1:43 PM, Damien Grassart <damien at grassart.com> wrote:
> Add .dir-locals.el and .editorconfig files in src/amd/vulkan and
> src/amd/common since they don't use the coding style defined in the
> root .dir-locals.el. Also update the styles for other directories that
> appear to use the Linux kernel style.
>
> Signed-off-by: Damien Grassart <damien at grassart.com>
> ---
>  src/amd/common/.dir-locals.el                 | 11 +++++++++++
>  src/amd/common/.editorconfig                  |  2 ++
>  src/amd/vulkan/.dir-locals.el                 | 11 +++++++++++
>  src/amd/vulkan/.editorconfig                  |  2 ++
>  src/gallium/drivers/r600/.dir-locals.el       |  2 +-
>  src/gallium/drivers/radeon/.dir-locals.el     |  2 +-
>  src/gallium/drivers/radeonsi/.dir-locals.el   |  2 +-
>  src/gallium/drivers/vc4/kernel/.dir-locals.el |  2 +-
>  src/mesa/drivers/dri/nouveau/.dir-locals.el   |  2 +-
>  9 files changed, 31 insertions(+), 5 deletions(-)
>  create mode 100644 src/amd/common/.dir-locals.el
>  create mode 100644 src/amd/common/.editorconfig
>  create mode 100644 src/amd/vulkan/.dir-locals.el
>  create mode 100644 src/amd/vulkan/.editorconfig
>
> diff --git a/src/amd/common/.dir-locals.el b/src/amd/common/.dir-locals.el
> new file mode 100644
> index 0000000000..3970d0a0fb
> --- /dev/null
> +++ b/src/amd/common/.dir-locals.el
> @@ -0,0 +1,11 @@
> +((prog-mode
> +  (indent-tabs-mode . true)
> +  (tab-width . 8)
> +  (c-basic-offset . 8)
> +  (c-file-style . "linux")
> +  (fill-column . 78)
> +  (eval . (progn
> +           (c-set-offset 'innamespace '0)
> +           (c-set-offset 'inline-open '0)))
> +  )
> + )
> diff --git a/src/amd/common/.editorconfig b/src/amd/common/.editorconfig
> new file mode 100644
> index 0000000000..cc8e11ffd6
> --- /dev/null
> +++ b/src/amd/common/.editorconfig
> @@ -0,0 +1,2 @@
> +[*.{c,h}]
> +indent_style = tab
> diff --git a/src/amd/vulkan/.dir-locals.el b/src/amd/vulkan/.dir-locals.el
> new file mode 100644
> index 0000000000..3970d0a0fb
> --- /dev/null
> +++ b/src/amd/vulkan/.dir-locals.el
> @@ -0,0 +1,11 @@
> +((prog-mode
> +  (indent-tabs-mode . true)
> +  (tab-width . 8)
> +  (c-basic-offset . 8)
> +  (c-file-style . "linux")
> +  (fill-column . 78)
> +  (eval . (progn
> +           (c-set-offset 'innamespace '0)
> +           (c-set-offset 'inline-open '0)))
> +  )
> + )
> diff --git a/src/amd/vulkan/.editorconfig b/src/amd/vulkan/.editorconfig
> new file mode 100644
> index 0000000000..cc8e11ffd6
> --- /dev/null
> +++ b/src/amd/vulkan/.editorconfig
> @@ -0,0 +1,2 @@
> +[*.{c,h}]
> +indent_style = tab
> diff --git a/src/gallium/drivers/r600/.dir-locals.el b/src/gallium/drivers/r600/.dir-locals.el
> index 4e35c129e7..3970d0a0fb 100644
> --- a/src/gallium/drivers/r600/.dir-locals.el
> +++ b/src/gallium/drivers/r600/.dir-locals.el
> @@ -2,7 +2,7 @@
>    (indent-tabs-mode . true)
>    (tab-width . 8)
>    (c-basic-offset . 8)
> -  (c-file-style . "stroustrup")
> +  (c-file-style . "linux")
>    (fill-column . 78)
>    (eval . (progn
>             (c-set-offset 'innamespace '0)
> diff --git a/src/gallium/drivers/radeon/.dir-locals.el b/src/gallium/drivers/radeon/.dir-locals.el
> index 4e35c129e7..3970d0a0fb 100644
> --- a/src/gallium/drivers/radeon/.dir-locals.el
> +++ b/src/gallium/drivers/radeon/.dir-locals.el
> @@ -2,7 +2,7 @@
>    (indent-tabs-mode . true)
>    (tab-width . 8)
>    (c-basic-offset . 8)
> -  (c-file-style . "stroustrup")
> +  (c-file-style . "linux")
>    (fill-column . 78)
>    (eval . (progn
>             (c-set-offset 'innamespace '0)
> diff --git a/src/gallium/drivers/radeonsi/.dir-locals.el b/src/gallium/drivers/radeonsi/.dir-locals.el
> index 4e35c129e7..3970d0a0fb 100644
> --- a/src/gallium/drivers/radeonsi/.dir-locals.el
> +++ b/src/gallium/drivers/radeonsi/.dir-locals.el
> @@ -2,7 +2,7 @@
>    (indent-tabs-mode . true)
>    (tab-width . 8)
>    (c-basic-offset . 8)
> -  (c-file-style . "stroustrup")
> +  (c-file-style . "linux")
>    (fill-column . 78)
>    (eval . (progn
>             (c-set-offset 'innamespace '0)
> diff --git a/src/gallium/drivers/vc4/kernel/.dir-locals.el b/src/gallium/drivers/vc4/kernel/.dir-locals.el
> index 49403de246..6ecb68bd06 100644
> --- a/src/gallium/drivers/vc4/kernel/.dir-locals.el
> +++ b/src/gallium/drivers/vc4/kernel/.dir-locals.el
> @@ -2,7 +2,7 @@
>    (indent-tabs-mode . t)
>    (tab-width . 8)
>    (c-basic-offset . 8)
> -  (c-file-style . "stroustrup")
> +  (c-file-style . "linux")
>    (fill-column . 78)
>    (eval . (progn
>             (c-set-offset 'innamespace '0)
> diff --git a/src/mesa/drivers/dri/nouveau/.dir-locals.el b/src/mesa/drivers/dri/nouveau/.dir-locals.el
> index 774f023ae6..dbe311b02c 100644
> --- a/src/mesa/drivers/dri/nouveau/.dir-locals.el
> +++ b/src/mesa/drivers/dri/nouveau/.dir-locals.el
> @@ -2,7 +2,7 @@
>    (indent-tabs-mode . true)
>    (tab-width . 8)
>    (c-basic-offset . 8)
> -  (c-file-style . "stroustrup")
> +  (c-file-style . "linux")
>    (fill-column . 78)
>    )
>   )
> --
> 2.12.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev