2 files changed, 33 insertions, 34 deletions
diff --git a/mariadb-server/.dir-locals.el b/mariadb-server/.dir-locals.el
index 595eb5b..2b4cff5 100644
--- a/mariadb-server/.dir-locals.el
+++ b/mariadb-server/.dir-locals.el
@@ -1,3 +1,35 @@
 ((nil . ((bug-reference-bug-regexp . "\\<\\(\\)\\([Mm][Dd][Ee][Vv]-[0-9]+\\)\\>")
          (bug-reference-url-format . "https://jira.mariadb.org/browse/%s")))
- )
+ (c++-mode
+  . ((indent-tabs-mode . nil)
+     (c-file-style . "linux")
+     (c-basic-offset . 2)
+     (c-offsets-alist
+      . (
+         (inline-open . 0)
+         (substatement . +)
+         (statement-block-intro . +)
+         (arglist-cont-nonempty c-lineup-gcc-asm-reg c-lineup-arglist)
+         (inclass . +)
+         (defun-block-intro . +)
+         ))
+     (comment-start . "/* ")
+     (comment-end . " */")
+     (comment-continue . "  ")
+     (comment-style . extra-line)))
+ (c-mode
+  . ((indent-tabs-mode . nil)
+     (c-file-style . "linux")
+     (c-basic-offset . 2)
+     (c-offsets-alist
+      . (
+         (inline-open . 0)
+         (substatement . +)
+         (statement-block-intro . +)
+         (arglist-cont-nonempty c-lineup-gcc-asm-reg c-lineup-arglist)
+         (inclass . +)
+         ))
+     (comment-start . "/* ")
+     (comment-end . " */")
+     (comment-continue . "  ")
+     (comment-style . extra-line))))
diff --git a/mariadb-server/sql/.dir-locals.el b/mariadb-server/sql/.dir-locals.el
deleted file mode 100644
index 2daa20a..0000000
--- a/mariadb-server/sql/.dir-locals.el
+++ /dev/null
@@ -1,33 +0,0 @@
-((c++-mode
-  . ((indent-tabs-mode . nil)
-     (c-file-style . "linux")
-     (c-basic-offset . 2)
-     (c-offsets-alist
-      . (
-         (inline-open . 0)
-         (substatement . +)
-         (statement-block-intro . +)
-         (arglist-cont-nonempty c-lineup-gcc-asm-reg c-lineup-arglist)
-         (inclass . +)
-         (defun-block-intro . +)
-         ))
-     (comment-start . "/* ")
-     (comment-end . " */")
-     (comment-continue . "  ")
-     (comment-style . extra-line)))
- (c-mode
-  . ((indent-tabs-mode . nil)
-     (c-file-style . "linux")
-     (c-basic-offset . 2)
-     (c-offsets-alist
-      . (
-         (inline-open . 0)
-         (substatement . +)
-         (statement-block-intro . +)
-         (arglist-cont-nonempty c-lineup-gcc-asm-reg c-lineup-arglist)
-         (inclass . +)
-         ))
-     (comment-start . "/* ")
-     (comment-end . " */")
-     (comment-continue . "  ")
-     (comment-style . extra-line))))