From 62c18c989890d5aebca5315f7bf7d8a367b0a87b Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 19 May 2020 05:13:47 +0100
Subject: fix(3p/nix): Set C++ style to "Google" in Emacs locals

---
 third_party/nix/.dir-locals.el | 17 +----------------
 third_party/nix/.editorconfig  | 26 --------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 third_party/nix/.editorconfig

(limited to 'third_party')

diff --git a/third_party/nix/.dir-locals.el b/third_party/nix/.dir-locals.el
index 2d1117f4bda6..92aa816f100e 100644
--- a/third_party/nix/.dir-locals.el
+++ b/third_party/nix/.dir-locals.el
@@ -1,16 +1 @@
-((c++-mode . (
-  (c-file-style . "k&r")
-  (c-basic-offset . 4)
-  (indent-tabs-mode . nil)
-  (tab-width . 4)
-  (show-trailing-whitespace . t)
-  (indicate-empty-lines . t)
-  (eval . (c-set-offset 'innamespace 0))
-  (eval . (c-set-offset 'defun-open 0))
-  (eval . (c-set-offset 'inline-open 0))
-  (eval . (c-set-offset 'arglist-intro '+))
-  (eval . (c-set-offset 'arglist-cont 0))
-  (eval . (c-set-offset 'arglist-cont-nonempty '+))
-  (eval . (c-set-offset 'substatement-open 0))
-  (eval . (c-set-offset 'access-label '-))
-  )))
+((c++-mode . ((c-file-style . "google"))))
diff --git a/third_party/nix/.editorconfig b/third_party/nix/.editorconfig
deleted file mode 100644
index 887ecadba596..000000000000
--- a/third_party/nix/.editorconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# EditorConfig configuration for nix
-# http://EditorConfig.org
-
-# Top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file, utf-8 charset
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-
-# Match nix files, set indent to spaces with width of two
-[*.nix]
-indent_style = space
-indent_size = 2
-
-# Match c++/shell/perl, set indent to spaces with width of four
-[*.{hpp,cc,hh,sh,pl}]
-indent_style = space
-indent_size = 4
-
-# Match diffs, avoid to trim trailing whitespace
-[*.{diff,patch}]
-trim_trailing_whitespace = false
-- 
cgit 1.4.1