Skip to content

Commit bce69f5

Browse files
committed
dir-locals.el: update emacs config to match meson style
The config is copied from systemd. The existing config specified 4-space indent for C, but individual files override this and the files in fact use 8 spaces. The config for Python doesn't seem necessary anymore either. I think utf-8 is used everywhere by default.
1 parent eba21fa commit bce69f5

File tree

15 files changed

+22
-16
lines changed

15 files changed

+22
-16
lines changed

.dir-locals.el

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
; A list of (major-mode . ((var1 . value1) (var2 . value2)))
33
; Mode can be nil, which gives default values.
44

5-
((nil . ((indent-tabs-mode . nil)
6-
(c-basic-offset . 4)))
7-
)
5+
; NOTE: If you update this file make sure to update .editorconfig too.
6+
7+
((c-mode . ((fill-column . 109)
8+
(c-basic-offset . 8)
9+
(eval . (c-set-offset 'substatement-open 0))
10+
(eval . (c-set-offset 'statement-case-open 0))
11+
(eval . (c-set-offset 'case-label 0))
12+
(eval . (c-set-offset 'arglist-intro '++))
13+
(eval . (c-set-offset 'arglist-close 0))
14+
(eval . (c-set-offset 'arglist-cont-nonempty '(c-lineup-gcc-asm-reg c-lineup-arglist)))))
15+
(meson-mode . ((meson-indent-basic . 8)))
16+
(nil . ((indent-tabs-mode . nil)
17+
(tab-width . 8)
18+
(fill-column . 79))) )

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.[ch] whitespace=tab-in-indent,trailing-space
2+
*.py whitespace=tab-in-indent,trailing-space

src/systemd/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- Mode: python; indent-tabs-mode: nil -*- */
21
#
32
#
43
# Copyright 2012 David Strauss

src/systemd/_daemon.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
21

32
/***
43

src/systemd/_journal.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
21

32
/***
43

src/systemd/_reader.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
21

32
/***
43

src/systemd/id128.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
21

32
/***
43

src/systemd/journal.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- Mode: python; coding:utf-8; indent-tabs-mode: nil -*- */
21
#
32
#
43
# Copyright 2012 David Strauss <[email protected]>

src/systemd/login.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
21

32
/***
43

src/systemd/macro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
21

32
#pragma once
43

0 commit comments

Comments
 (0)