[Bf-blender-cvs] [58761eb11a6] master: GNUmakefile: move editor settings to .editorconfig
Campbell Barton
noreply at git.blender.org
Wed Feb 9 23:22:20 CET 2022
Commit: 58761eb11a681abbde1809a01ab8dde75aa8f46e
Author: Campbell Barton
Date: Thu Feb 10 09:20:34 2022 +1100
Branches: master
https://developer.blender.org/rB58761eb11a681abbde1809a01ab8dde75aa8f46e
GNUmakefile: move editor settings to .editorconfig
Remove inline vim/emacs editor configuration,
add makefile to editorconfig instead.
===================================================================
M .editorconfig
M GNUmakefile
===================================================================
diff --git a/.editorconfig b/.editorconfig
index 691643adebe..41ec3a1dc3d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -42,3 +42,12 @@ insert_final_newline = true
indent_style = space
indent_size = 3
max_line_length = 120
+
+# Makefile
+[{Makefile,GNUmakefile}]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+max_line_length = 120
\ No newline at end of file
diff --git a/GNUmakefile b/GNUmakefile
index e4703973384..feca1236e72 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,3 @@
-# -*- mode: gnumakefile; tab-width: 4; indent-tabs-mode: t; -*-
-# vim: tabstop=4
-#
# ##### BEGIN GPL LICENSE BLOCK #####
#
# This program is free software; you can redistribute it and/or
More information about the Bf-blender-cvs
mailing list