From b26fa1a2fbcfee7d03b0c8fd15ec3aa64ae70b9f Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Wed, 10 Feb 2016 13:26:21 +0100
Subject: tree-wide: remove Emacs lines from all files

This should be handled fine now by .dir-locals.el, so need to carry that
stuff in every file.
---
 src/journal/audit-type.c                | 2 --
 src/journal/audit-type.h                | 2 --
 src/journal/cat.c                       | 2 --
 src/journal/catalog.c                   | 2 --
 src/journal/catalog.h                   | 2 --
 src/journal/compress.c                  | 2 --
 src/journal/compress.h                  | 2 --
 src/journal/coredump-vacuum.c           | 2 --
 src/journal/coredump-vacuum.h           | 2 --
 src/journal/coredump.c                  | 2 --
 src/journal/coredumpctl.c               | 2 --
 src/journal/fsprg.c                     | 2 --
 src/journal/fsprg.h                     | 2 --
 src/journal/journal-authenticate.c      | 2 --
 src/journal/journal-authenticate.h      | 2 --
 src/journal/journal-def.h               | 2 --
 src/journal/journal-file.c              | 2 --
 src/journal/journal-file.h              | 2 --
 src/journal/journal-internal.h          | 2 --
 src/journal/journal-qrcode.c            | 2 --
 src/journal/journal-qrcode.h            | 2 --
 src/journal/journal-send.c              | 2 --
 src/journal/journal-vacuum.c            | 2 --
 src/journal/journal-vacuum.h            | 2 --
 src/journal/journal-verify.c            | 2 --
 src/journal/journal-verify.h            | 2 --
 src/journal/journalctl.c                | 2 --
 src/journal/journald-audit.c            | 2 --
 src/journal/journald-audit.h            | 2 --
 src/journal/journald-console.c          | 2 --
 src/journal/journald-console.h          | 2 --
 src/journal/journald-kmsg.c             | 2 --
 src/journal/journald-kmsg.h             | 2 --
 src/journal/journald-native.c           | 2 --
 src/journal/journald-native.h           | 2 --
 src/journal/journald-rate-limit.c       | 2 --
 src/journal/journald-rate-limit.h       | 2 --
 src/journal/journald-server.c           | 2 --
 src/journal/journald-server.h           | 2 --
 src/journal/journald-stream.c           | 2 --
 src/journal/journald-stream.h           | 2 --
 src/journal/journald-syslog.c           | 2 --
 src/journal/journald-syslog.h           | 2 --
 src/journal/journald-wall.c             | 2 --
 src/journal/journald-wall.h             | 2 --
 src/journal/journald.c                  | 2 --
 src/journal/lookup3.h                   | 2 --
 src/journal/mmap-cache.c                | 2 --
 src/journal/mmap-cache.h                | 2 --
 src/journal/sd-journal.c                | 2 --
 src/journal/stacktrace.c                | 2 --
 src/journal/stacktrace.h                | 2 --
 src/journal/test-audit-type.c           | 2 --
 src/journal/test-catalog.c              | 2 --
 src/journal/test-compress-benchmark.c   | 2 --
 src/journal/test-coredump-vacuum.c      | 2 --
 src/journal/test-journal-enum.c         | 2 --
 src/journal/test-journal-flush.c        | 2 --
 src/journal/test-journal-init.c         | 2 --
 src/journal/test-journal-interleaving.c | 2 --
 src/journal/test-journal-match.c        | 2 --
 src/journal/test-journal-send.c         | 2 --
 src/journal/test-journal-stream.c       | 2 --
 src/journal/test-journal-syslog.c       | 2 --
 src/journal/test-journal-verify.c       | 2 --
 src/journal/test-journal.c              | 2 --
 src/journal/test-mmap-cache.c           | 2 --
 67 files changed, 134 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c
index 086bf7e7e3..71e8790ca8 100644
--- a/src/journal/audit-type.c
+++ b/src/journal/audit-type.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h
index fa5284e027..1dd2163707 100644
--- a/src/journal/audit-type.h
+++ b/src/journal/audit-type.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 07c3df522c..08c844d44f 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index ddec6bd503..164a3a15f2 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/catalog.h b/src/journal/catalog.h
index b3856d2de0..1b1014b335 100644
--- a/src/journal/catalog.h
+++ b/src/journal/catalog.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/compress.c b/src/journal/compress.c
index 78935fee74..1933b87b00 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/compress.h b/src/journal/compress.h
index 758598730a..c138099d9a 100644
--- a/src/journal/compress.h
+++ b/src/journal/compress.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/coredump-vacuum.c b/src/journal/coredump-vacuum.c
index 09ab60c6c4..f02b6dbd87 100644
--- a/src/journal/coredump-vacuum.c
+++ b/src/journal/coredump-vacuum.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/coredump-vacuum.h b/src/journal/coredump-vacuum.h
index 7779c97574..4b7b9f2d98 100644
--- a/src/journal/coredump-vacuum.h
+++ b/src/journal/coredump-vacuum.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 8298b02439..8b1c670cc6 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index 40ffa6afbe..0034a1a0ac 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/fsprg.c b/src/journal/fsprg.c
index a9f564c249..8f7e137e74 100644
--- a/src/journal/fsprg.c
+++ b/src/journal/fsprg.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /*
  * fsprg v0.1  -  (seekable) forward-secure pseudorandom generator
  * Copyright (C) 2012 B. Poettering
diff --git a/src/journal/fsprg.h b/src/journal/fsprg.h
index b79221fc2e..829b56e240 100644
--- a/src/journal/fsprg.h
+++ b/src/journal/fsprg.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #ifndef __fsprgh__
 #define __fsprgh__
 
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index aeec83da1e..49f3c8f0f4 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h
index 118bb1367b..6c87319ede 100644
--- a/src/journal/journal-authenticate.h
+++ b/src/journal/journal-authenticate.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index c003ac05dd..67edb43960 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 3fcec88e94..912eb94d0a 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 7970ebe738..07b9561b8a 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index a55d1bcc47..7639325acf 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journal-qrcode.c b/src/journal/journal-qrcode.c
index 257ddb302b..e38730d65c 100644
--- a/src/journal/journal-qrcode.c
+++ b/src/journal/journal-qrcode.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h
index 7d14e8754b..ef39085561 100644
--- a/src/journal/journal-qrcode.h
+++ b/src/journal/journal-qrcode.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index def4caab92..c7d670f4ff 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index 4b5fc76eb1..05e97620ae 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journal-vacuum.h b/src/journal/journal-vacuum.h
index 49ab90af91..1e750a2170 100644
--- a/src/journal/journal-vacuum.h
+++ b/src/journal/journal-vacuum.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 715847e018..b968e89bb8 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journal-verify.h b/src/journal/journal-verify.h
index e392ab61d7..8f0eaf6daa 100644
--- a/src/journal/journal-verify.h
+++ b/src/journal/journal-verify.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 20f7082175..273242bea6 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 28970131e7..b2eb8a33ef 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
index 5c88bb6383..8c7457778c 100644
--- a/src/journal/journald-audit.h
+++ b/src/journal/journald-audit.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 04487c29b5..fcc9f25814 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-console.h b/src/journal/journald-console.h
index d8af2267e1..dda07e2c28 100644
--- a/src/journal/journald-console.h
+++ b/src/journal/journald-console.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 1306ad6974..eb1ac90e98 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h
index 9a9d089967..dab49f1e8c 100644
--- a/src/journal/journald-kmsg.h
+++ b/src/journal/journald-kmsg.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index f80a6ebfe5..3d8f05996b 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-native.h b/src/journal/journald-native.h
index 2f9d458fb5..c13b80aa4f 100644
--- a/src/journal/journald-native.h
+++ b/src/journal/journald-native.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 1c406aef8e..6f6a90fe4e 100644
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-rate-limit.h b/src/journal/journald-rate-limit.h
index 466239d3c6..bb0abb7ee9 100644
--- a/src/journal/journald-rate-limit.h
+++ b/src/journal/journald-rate-limit.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 6a4e3bf249..ee2db8d29f 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 49bbee0646..b9551dda1b 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 90884b6929..6e8b405b53 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
index e3497f0ded..db4c67fae3 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 9f2ccdcc77..5153fd0cce 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
index 3774ebdf05..46ad715314 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c
index 88bea3b86e..4d91fafffe 100644
--- a/src/journal/journald-wall.c
+++ b/src/journal/journald-wall.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/journald-wall.h b/src/journal/journald-wall.h
index 45c52854a0..ebc2b89fa8 100644
--- a/src/journal/journald-wall.h
+++ b/src/journal/journald-wall.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 293b788d03..272acb71c4 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/lookup3.h b/src/journal/lookup3.h
index 3224473a6a..787921ffbf 100644
--- a/src/journal/lookup3.h
+++ b/src/journal/lookup3.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 4636e4b395..9c0ce8ccbf 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
index 37ea7b4a9c..199d944647 100644
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 5ff2335efe..5a2a28a8d4 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/stacktrace.c b/src/journal/stacktrace.c
index 4305462f80..68806992fc 100644
--- a/src/journal/stacktrace.c
+++ b/src/journal/stacktrace.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/stacktrace.h b/src/journal/stacktrace.h
index 189e5c4597..15e9c04465 100644
--- a/src/journal/stacktrace.h
+++ b/src/journal/stacktrace.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
diff --git a/src/journal/test-audit-type.c b/src/journal/test-audit-type.c
index 7946cf3c41..88a2e6d9d9 100644
--- a/src/journal/test-audit-type.c
+++ b/src/journal/test-audit-type.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index ae936f6419..da6fcbca4d 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index baed0d82a4..5b2d130cd6 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd
 
diff --git a/src/journal/test-coredump-vacuum.c b/src/journal/test-coredump-vacuum.c
index 514dadc1dc..70a57f183f 100644
--- a/src/journal/test-coredump-vacuum.c
+++ b/src/journal/test-coredump-vacuum.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index d396fabdab..e5e9d9dcb3 100644
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
index 03d1522e23..7bd9c40366 100644
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c
index 142da85041..ef21e2d05f 100644
--- a/src/journal/test-journal-init.c
+++ b/src/journal/test-journal-init.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 5c055ef748..7f94990888 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c
index 4ebaa8b31a..3ab554b9b0 100644
--- a/src/journal/test-journal-match.c
+++ b/src/journal/test-journal-match.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c
index e537c1fe5f..d70f0b0bc8 100644
--- a/src/journal/test-journal-send.c
+++ b/src/journal/test-journal-send.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index 2c257e43b6..4e6f8c0f7b 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c
index 1784187fe9..4ff7f3ec2e 100644
--- a/src/journal/test-journal-syslog.c
+++ b/src/journal/test-journal-syslog.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index a7abb11fba..a26c624f41 100644
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 266e0d5473..0334b1cd1a 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
index fdd48e531c..009aabf55e 100644
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
-- 
cgit v1.2.3-54-g00ecf