Merge #8894 from janlazo/editorconfig-makefile

2025-02-25 18:55:25 -06:00 · 2018-08-24 09:12:08 +02:00 · 2018-08-24 09:12:08 +02:00 · e7d020e08f
commit e7d020e08f
parent 2ab80b944b c5b5eaabad
2 changed files with 103 additions and 107 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -7,10 +7,6 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf_8

-[runtime/doc/*.txt]
+[{Makefile,**/Makefile,runtime/doc/*.txt}]
 indent_style = tab
 indent_size = 8
-
-[Makefile]
-indent_style = tab
-tab_width = 4
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@ -14,18 +14,18 @@ export NVIM_PRG := $(NVIM_PRG)
 export TMPDIR := $(abspath ../../../Xtest-tmpdir)

 SCRIPTS_DEFAULT = \
-           test14.out             \
-           test24.out             \
-           test37.out             \
-           test42.out             \
-           test48.out             \
-           test52.out             \
-           test64.out             \
+	test14.out             \
+	test24.out             \
+	test37.out             \
+	test42.out             \
+	test48.out             \
+	test52.out             \
+	test64.out             \

 ifneq ($(OS),Windows_NT)
  SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \
-           test17.out             \
-           test49.out             \
+	test17.out             \
+	test49.out             \

 endif

@ -34,99 +34,99 @@ SCRIPTS ?= $(SCRIPTS_DEFAULT)
 # Tests using runtest.vim.
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS ?= \
-	    test_arabic.res \
-	    test_autocmd.res \
-	    test_blockedit.res \
-	    test_bufwintabinfo.res \
-	    test_changedtick.res \
-	    test_charsearch.res \
-	    test_cindent.res \
-	    test_clientserver.res \
-	    test_close_count.res \
-	    test_cmdline.res \
-	    test_command_count.res \
-	    test_cscope.res \
-	    test_curswant.res \
-	    test_digraph.res \
-	    test_edit.res \
-	    test_erasebackword.res \
-	    test_exists.res \
-	    test_diffmode.res \
-	    test_farsi.res \
-	    test_file_size.res \
-	    test_filter_map.res \
-	    test_find_complete.res \
-	    test_fixeol.res \
-	    test_findfile.res \
-	    test_fnameescape.res \
-	    test_fold.res \
-	    test_ga.res \
-	    test_getvar.res \
-	    test_glob2regpat.res \
-	    test_gf.res \
-	    test_gn.res \
-	    test_hardcopy.res \
-	    test_help_tagjump.res \
-	    test_hide.res \
-	    test_highlight.res \
-	    test_history.res \
-	    test_hlsearch.res \
-	    test_increment.res \
-	    test_increment_dbcs.res \
-	    test_ins_complete.res \
-	    test_lambda.res \
-	    test_langmap.res \
-	    test_let.res \
-	    test_lineending.res \
-	    test_listdict.res \
-	    test_listchars.res \
-	    test_makeencoding.res \
-	    test_marks.res \
-	    test_match.res \
-	    test_matchadd_conceal.res \
-	    test_mksession.res \
-	    test_nested_function.res \
-	    test_normal.res \
-	    test_number.res \
-	    test_options.res \
-	    test_preview.res \
-	    test_profile.res \
-	    test_put.res \
-	    test_python2.res \
-	    test_python3.res \
-	    test_quickfix.res \
-	    test_quotestar.res \
-	    test_recover.res \
-	    test_registers.res \
-	    test_retab.res \
-	    test_scrollbind.res \
-	    test_search.res \
-	    test_signs.res \
-	    test_smartindent.res \
-	    test_spell.res \
-	    test_stat.res \
-	    test_startup.res \
-	    test_substitute.res \
-	    test_swap.res \
-	    test_syntax.res \
-	    test_system.res \
-	    test_tab.res \
-	    test_tabpage.res \
-	    test_textobjects.res \
-	    test_timers.res \
-	    test_undo.res \
-	    test_usercommands.res \
-	    test_user_func.res \
-	    test_vimscript.res \
-	    test_visual.res \
-	    test_winbuf_close.res \
-	    test_window_id.res \
-	    test_windows_home.res \
-	    test_wordcount.res \
-	    test_writefile.res \
-	    test_alot_latin.res \
-	    test_alot_utf8.res \
-	    test_alot.res
+	test_arabic.res \
+	test_autocmd.res \
+	test_blockedit.res \
+	test_bufwintabinfo.res \
+	test_changedtick.res \
+	test_charsearch.res \
+	test_cindent.res \
+	test_clientserver.res \
+	test_close_count.res \
+	test_cmdline.res \
+	test_command_count.res \
+	test_cscope.res \
+	test_curswant.res \
+	test_digraph.res \
+	test_edit.res \
+	test_erasebackword.res \
+	test_exists.res \
+	test_diffmode.res \
+	test_farsi.res \
+	test_file_size.res \
+	test_filter_map.res \
+	test_find_complete.res \
+	test_fixeol.res \
+	test_findfile.res \
+	test_fnameescape.res \
+	test_fold.res \
+	test_ga.res \
+	test_getvar.res \
+	test_glob2regpat.res \
+	test_gf.res \
+	test_gn.res \
+	test_hardcopy.res \
+	test_help_tagjump.res \
+	test_hide.res \
+	test_highlight.res \
+	test_history.res \
+	test_hlsearch.res \
+	test_increment.res \
+	test_increment_dbcs.res \
+	test_ins_complete.res \
+	test_lambda.res \
+	test_langmap.res \
+	test_let.res \
+	test_lineending.res \
+	test_listdict.res \
+	test_listchars.res \
+	test_makeencoding.res \
+	test_marks.res \
+	test_match.res \
+	test_matchadd_conceal.res \
+	test_mksession.res \
+	test_nested_function.res \
+	test_normal.res \
+	test_number.res \
+	test_options.res \
+	test_preview.res \
+	test_profile.res \
+	test_put.res \
+	test_python2.res \
+	test_python3.res \
+	test_quickfix.res \
+	test_quotestar.res \
+	test_recover.res \
+	test_registers.res \
+	test_retab.res \
+	test_scrollbind.res \
+	test_search.res \
+	test_signs.res \
+	test_smartindent.res \
+	test_spell.res \
+	test_stat.res \
+	test_startup.res \
+	test_substitute.res \
+	test_swap.res \
+	test_syntax.res \
+	test_system.res \
+	test_tab.res \
+	test_tabpage.res \
+	test_textobjects.res \
+	test_timers.res \
+	test_undo.res \
+	test_usercommands.res \
+	test_user_func.res \
+	test_vimscript.res \
+	test_visual.res \
+	test_winbuf_close.res \
+	test_window_id.res \
+	test_windows_home.res \
+	test_wordcount.res \
+	test_writefile.res \
+	test_alot_latin.res \
+	test_alot_utf8.res \
+	test_alot.res

 SCRIPTS_GUI := test16.out