summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-17 19:24:48 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-17 19:24:48 -0400
commit70e672f8567088ce6ce704dc1f51dd3ce2873a38 (patch)
tree91e19c17f74e2b79e2d5192918d1ff3edacc58d7
parent8184f45ad94b5305c519f427a503d14ecb2f12dd (diff)
parenta360bf287d8220ec2e4899c57ed47a2a91e3bcb9 (diff)
downloadtor-70e672f8567088ce6ce704dc1f51dd3ce2873a38.tar.gz
tor-70e672f8567088ce6ce704dc1f51dd3ce2873a38.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
-rw-r--r--.editorconfig33
1 files changed, 33 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..27ed90fafd
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,33 @@
+# this should work for all editors that support .editorconfig!
+#
+# on debian, emacs users should install elpa-editorconfig and vim
+# users should install vim-editorconfig.
+
+root = true
+
+[*]
+indent_style = space
+# this remove final newline in some editors, instead of inserting it
+# insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+max_line_length = 79
+
+[*.py]
+indent_size = 4
+# to do not have final newline in python code
+insert_final_newline = true
+
+[*.c, *.h]
+# done in tests and other cases do not use 2 spaces identations, so this
+# should be commented on those cases
+indent_size = 2
+trim_trailing_whitespace = true
+
+[Makefile, *.am]
+indent_style = tab
+
+[*-spec.txt]
+# specs seem to have 76 chars max per lines as RFCs
+max_line_length = 76 \ No newline at end of file