Skip to content

Commit 812c8bc

Browse files
authored
Add editorconfig
This commit also purges .gitignore, since the files mentioned in it should be handled by global ignore file. Fixes alacritty#4378.
1 parent ec42b42 commit 812c8bc

File tree

3 files changed

+22
-39
lines changed

3 files changed

+22
-39
lines changed

Diff for: .editorconfig

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
trim_trailing-whitespace = true
7+
insert_final_newline = true
8+
9+
[*.{glsl,rs,toml}]
10+
indent_style = space
11+
indent_size = 4
12+
13+
[*.yml]
14+
indent_style = space
15+
indent_size = 2
16+
17+
[Makefile]
18+
indent_style = tab

Diff for: .gitignore

+1-36
Original file line numberDiff line numberDiff line change
@@ -1,36 +1 @@
1-
# Rust build directory
2-
**/target
3-
4-
# Rust subcrate lockfiles
5-
*/Cargo.lock
6-
7-
# Temp files
8-
.idea
9-
.vscode
10-
*.iml
11-
*~
12-
13-
# vim temporary files
14-
*.swp
15-
16-
# other ignores
17-
*.DS_Store
18-
=======
19-
20-
# Snapcraft files
21-
stage
22-
prime
23-
parts
24-
*.snap
25-
*.pyc
26-
alacritty_*_source.tar.bz2
27-
28-
# WiX files
29-
/Wix.3.11.1
30-
*.msi
31-
*.wixobj
32-
*.wixpdb
33-
34-
# Perf tools
35-
perf.data*
36-
flamegraph.svg
1+
target

Diff for: Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ MANPAGE = $(ASSETS_DIR)/alacritty.man
66
TERMINFO = $(ASSETS_DIR)/alacritty.info
77
COMPLETIONS_DIR = $(ASSETS_DIR)/completions
88
COMPLETIONS = $(COMPLETIONS_DIR)/_alacritty \
9-
$(COMPLETIONS_DIR)/alacritty.bash \
10-
$(COMPLETIONS_DIR)/alacritty.fish
9+
$(COMPLETIONS_DIR)/alacritty.bash \
10+
$(COMPLETIONS_DIR)/alacritty.fish
1111

1212
APP_NAME = Alacritty.app
1313
APP_TEMPLATE = $(ASSETS_DIR)/osx/$(APP_NAME)
1414
APP_DIR = $(RELEASE_DIR)/osx
1515
APP_BINARY = $(RELEASE_DIR)/$(TARGET)
16-
APP_BINARY_DIR = $(APP_DIR)/$(APP_NAME)/Contents/MacOS
16+
APP_BINARY_DIR = $(APP_DIR)/$(APP_NAME)/Contents/MacOS
1717
APP_EXTRAS_DIR = $(APP_DIR)/$(APP_NAME)/Contents/Resources
1818
APP_COMPLETIONS_DIR = $(APP_EXTRAS_DIR)/completions
1919

0 commit comments

Comments
 (0)