From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 28 Jan 2026 09:42:15 +0000 (+0100)
Subject: emacs: drop obsolete emacs property
X-Git-Tag: v257.11~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=876baf643358814fa78047f989e570f3a9b68941;p=thirdparty%2Fsystemd.git

emacs: drop obsolete emacs property

New emacs warns on every open about the old attribute. Let's assume that
everybody who uses emacs uses the latest version, so we can drop the compat.

(cherry picked from commit 0c40aef7ef1419233826b6fb7ccac12f7623033b)
(cherry picked from commit 5c9ae10762cbfc771544c84abf464135807c2e66)
(cherry picked from commit 20c73f1c2742fb8ef3c458bc9dc4c9b510bcfebd)
---

diff --git a/.dir-locals.el b/.dir-locals.el
index fde58d65bdd..6944406da07 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -20,8 +20,7 @@
  (nxml-mode . ((nxml-child-indent . 2)
                (fill-column . 109)))
  (meson-mode . ((meson-indent-basic . 8)))
- (sh-mode . ((sh-basic-offset . 4)
-             (sh-indentation . 4)))
+ (sh-mode . ((sh-indentation . 4)))
  (awk-mode . ((c-basic-offset . 8)))
  (nil . ((indent-tabs-mode . nil)
          (tab-width . 8)