From 481b490b8231c47ea33ce7abea2d38f82fc9ccff Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 2 Mar 2021 11:11:08 -0800
Subject: [PATCH] Miscellaneous EditorConfig fixes

In the top-level .editorconfig, note that we don't use CMake's standard
indentation.

Remove ascendtext.[ch] from wiretap/.editorconfig since it's no longer
needed.
---
 .editorconfig         | 2 ++
 wiretap/.editorconfig | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b86091a7af..a77106ec90 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,6 +16,8 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 
 # CMake
+# The CMake project itself uses two spaces:
+# https://gitlab.kitware.com/cmake/cmake/-/blob/master/.editorconfig
 [{CMake*,*.cmake,*.cmake.in}]
 indent_style = tab
 
diff --git a/wiretap/.editorconfig b/wiretap/.editorconfig
index aef8493f41..004cf195f1 100644
--- a/wiretap/.editorconfig
+++ b/wiretap/.editorconfig
@@ -12,9 +12,6 @@ indent_size = tab
 indent_style = tab
 indent_size = tab
 
-[ascendtext.[ch]]
-indent_size = 2
-
 [atm.[ch]]
 indent_style = tab
 indent_size = tab