Merge branch 'editorconfig' into 'master'

Switch to EditorConfig from Vim modelines

See merge request pacman/pacman-contrib!9

27 files changed, 47 insertions, 97 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a58d138
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+
+[{configure.ac,Makefile.am,*.c,*.pl.in,*.sh,*.sh.in}]
+indent_style = tab
+
+[*.adoc]
+indent_style = tab
+indent_size = 4
diff --git a/Makefile.am b/Makefile.am
index 8cce2f4..fb3e64b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,4 @@ TEST_SUITE_LOG = test/test-suite.log
 AM_TESTS_ENVIRONMENT = \
 	PMTEST_BIN_DIR=$(top_builddir)/src/; export PMTEST_BIN_DIR;
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-								 $(top_srcdir)/build-aux/tap-driver.sh
+	$(top_srcdir)/build-aux/tap-driver.sh
diff --git a/configure.ac b/configure.ac
index 98b302c..750a016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,5 +196,3 @@ ${PACKAGE_NAME}:
     extra warning flags    : ${warningflags}
     use git version        : ${wantgitver}
 "
-
-# vim:set noet:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0056848..84c66c4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,13 +30,13 @@ HTML_DOCS = \
 EXTRA_DIST = \
 	asciidoc.conf \
 	asciidoc-override.css \
-	checkupdates.8.txt \
-	paccache.8.txt \
-	pacdiff.8.txt \
-	pacsort.8.txt \
-	pactree.8.txt \
-	updpkgsums.8.txt \
-	footer.txt \
+	checkupdates.8.adoc \
+	paccache.8.adoc \
+	pacdiff.8.adoc \
+	pacsort.8.adoc \
+	pactree.8.adoc \
+	updpkgsums.8.adoc \
+	footer.adoc \
 	$(ASCIIDOC_MANS)
 
 # Files that should be removed, but which Automake does not know.
@@ -89,11 +89,11 @@ A2X_OPTS = \
 	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
 
 # These rules are due to the includes and files of the asciidoc text
-$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am
-	$(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt
+$(ASCIIDOC_MANS): asciidoc.conf footer.adoc Makefile.am
+	$(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.adoc
 
-%.html: %.txt
-	$(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.txt | \
+%.html: %.adoc
+	$(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.adoc | \
 		sed -e 's/\r$$//' > $@
 
 HACKING.html: ../HACKING
@@ -101,7 +101,7 @@ HACKING.html: ../HACKING
 		sed -e 's/\r$$//' > $@
 
 # Customizations for certain HTML docs
-$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile.am
+$(HTML_MANPAGES): asciidoc.conf footer.adoc Makefile.am
 $(HTML_OTHER): asciidoc.conf Makefile.am
 %.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css
 %.8.html: ASCIIDOC_OPTS += -d manpage
@@ -109,11 +109,9 @@ $(HTML_OTHER): asciidoc.conf Makefile.am
 %.3.html: ASCIIDOC_OPTS += -d manpage
 
 # Dependency rules
-checkupdates.8 checkupdates.8.html: checkupdates.8.txt
-paccache.8 paccache.8.html: paccache.8.txt
-pacdiff.8 pacdiff.8.html: pacdiff.8.txt
-pactree.8 pactree.8.html: pactree.8.txt
-pacsort.8 pacsort.8.html: pacsort.8.txt
-updpkgsums.8 updpkgsums.8.html: updpkgsums.8.txt
-
-# vim:set noet:
+checkupdates.8 checkupdates.8.html: checkupdates.8.adoc
+paccache.8 paccache.8.html: paccache.8.adoc
+pacdiff.8 pacdiff.8.html: pacdiff.8.adoc
+pactree.8 pactree.8.html: pactree.8.adoc
+pacsort.8 pacsort.8.html: pacsort.8.adoc
+updpkgsums.8 updpkgsums.8.html: updpkgsums.8.adoc
diff --git a/doc/checkupdates.8.txt b/doc/checkupdates.8.adoc
index 27ff1ea..17844b4 100644
--- a/doc/checkupdates.8.txt
+++ b/doc/checkupdates.8.adoc
@@ -1,8 +1,5 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 checkupdates(8)
-=============
+===============
 
 Name
 ----
@@ -27,8 +24,8 @@ Options
 	Download any pending updates to the pacman cache.
 
 *-n, \--nosync*::
-	Do not sync the temporary database, works best when the temporary database is 
-	update regularly through some other means such as a cronjob or systemd timer.
+	Do not sync the temporary database, works best when the temporary database is
+	updated regularly through some other means such as a cronjob or systemd timer.
 
 *-h, \--help*::
 	Display syntax and command line options.
@@ -61,4 +58,4 @@ See Also
 --------
 linkman:pacman[8], linkman:pacman.conf[5]
 
-include::footer.txt[]
+include::footer.adoc[]
diff --git a/doc/contributing.txt b/doc/contributing.adoc
index a0c654f..c92f400 100644
--- a/doc/contributing.txt
+++ b/doc/contributing.adoc
@@ -59,7 +59,3 @@ submission of commits with corrections or a follow-up comment asking
 for clarifications.
 
 --
-
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
diff --git a/doc/footer.txt b/doc/footer.adoc
index 9fe3169..b956dc2 100644
--- a/doc/footer.txt
+++ b/doc/footer.adoc
@@ -1,17 +1,12 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
-
 Bugs
 ----
 Bugs? You must be kidding; there are no bugs in this software. But if we
-happen to be wrong, send us an email with as much detail as possible to
-mailto:pacman-contrib@lists.archlinux.org[].
+happen to be wrong, file an issue with as much detail as possible at
+https://gitlab.archlinux.org/pacman/pacman-contrib/-/issues/new.
 
 
 Authors
 -------
-
 Current maintainers:
 
 * Johannes Löthberg <johannes@kyriasis.com>
diff --git a/doc/paccache.8.txt b/doc/paccache.8.adoc
index 2d32ada..9d84dc7 100644
--- a/doc/paccache.8.txt
+++ b/doc/paccache.8.adoc
@@ -1,8 +1,5 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 paccache(8)
-=========
+===========
 
 Name
 ----
@@ -89,4 +86,4 @@ See Also
 --------
 linkman:pacman[8], linkman:pacman.conf[5], linkman:systemctl[1]
 
-include::footer.txt[]
+include::footer.adoc[]
diff --git a/doc/pacdiff.8.txt b/doc/pacdiff.8.adoc
index 12f786b..da756e8 100644
--- a/doc/pacdiff.8.txt
+++ b/doc/pacdiff.8.adoc
@@ -1,6 +1,3 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 pacdiff(8)
 ==========
 
@@ -60,4 +57,4 @@ See Also
 --------
 linkman:pacman[8], linkman:pacman.conf[5]
 
-include::footer.txt[]
+include::footer.adoc[]
diff --git a/doc/pacsort.8.txt b/doc/pacsort.8.adoc
index 0f5a4e9..a6f498d 100644
--- a/doc/pacsort.8.txt
+++ b/doc/pacsort.8.adoc
@@ -1,8 +1,5 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 pacsort(8)
-=========
+==========
 
 Name
 ----
@@ -52,4 +49,4 @@ See Also
 --------
 linkman:pacman[8], linkman:vercmp[8]
 
-include::footer.txt[]
+include::footer.adoc[]
diff --git a/doc/pactree.8.txt b/doc/pactree.8.adoc
index 02eee5b..7fe0bc4 100644
--- a/doc/pactree.8.txt
+++ b/doc/pactree.8.adoc
@@ -1,8 +1,5 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 pactree(8)
-=========
+==========
 
 Name
 ----
@@ -79,4 +76,4 @@ See Also
 --------
 linkman:pacman[8], linkman:pacman.conf[5], linkman:makepkg[8]
 
-include::footer.txt[]
+include::footer.adoc[]
diff --git a/doc/release-procedure.txt b/doc/release-procedure.adoc
index aab3445..646b9dc 100644
--- a/doc/release-procedure.txt
+++ b/doc/release-procedure.adoc
@@ -38,7 +38,3 @@ git notes --ref=refs/notes/signatures/tar add -C "$(
 * `git push $REMOTE master $VERSION refs/notes/signatures/tar`
 
 --
-
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
diff --git a/doc/updpkgsums.8.txt b/doc/updpkgsums.8.adoc
index 8ccbe77..8279b41 100644
--- a/doc/updpkgsums.8.txt
+++ b/doc/updpkgsums.8.adoc
@@ -1,8 +1,5 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 updpkgsums(8)
-===========
+=============
 
 Name
 ----
@@ -34,4 +31,4 @@ See Also
 --------
 linkman:makepkg[8], linkman:pkgbuild[5]
 
-include::footer.txt[]
+include::footer.adoc[]
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c7a1385..74e93ca 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,5 +4,3 @@ DIST_SUBDIRS = $(SUBDIRS)
 
 EXTRA_DIST = \
 	size_to_human.sh
-
-# vim:set noet:
diff --git a/src/Makefile.am b/src/Makefile.am
index 5101f4a..13d56fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,5 +139,3 @@ pacsort_LDADD = $(LIBARCHIVE_LIBS) $(LIBALPM_LIBS)
 
 pactree_SOURCES = pactree.c
 pactree_LDADD = $(LIBARCHIVE_LIBS) $(LIBALPM_LIBS)
-
-# vim:set noet:
diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in
index f7706ff..7fa47ba 100644
--- a/src/checkupdates.sh.in
+++ b/src/checkupdates.sh.in
@@ -133,5 +133,3 @@ if (( ${#updates[@]} )); then
 else
 	exit 2
 fi
-
-# vim: set noet:
diff --git a/src/paccache.sh.in b/src/paccache.sh.in
index 5ab467e..30f72f1 100644
--- a/src/paccache.sh.in
+++ b/src/paccache.sh.in
@@ -406,5 +406,3 @@ elif (( move )); then
 fi
 
 summarize "$pkgcount" "${candidates[@]}"
-
-# vim: set noet:
diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in
index 3c34fdb..43b5e5b 100644
--- a/src/pacdiff.sh.in
+++ b/src/pacdiff.sh.in
@@ -288,5 +288,3 @@ done 3< <(cmd)
 (( ${#oldsaves[@]} )) && warning "Ignoring %s" "${oldsaves[@]}"
 
 exit 0
-
-# vim: set noet:
diff --git a/src/paclist.sh.in b/src/paclist.sh.in
index 5c4c896..672728a 100644
--- a/src/paclist.sh.in
+++ b/src/paclist.sh.in
@@ -54,5 +54,3 @@ pacman -Sl "$@" | awk '/\[.*[[:alpha:]]+]$/ {print $2,$3};
 
 # exit with pacman's return value, not awk's
 exit ${PIPESTATUS[0]}
-
-# vim: set noet:
diff --git a/src/paclog-pkglist.sh.in b/src/paclog-pkglist.sh.in
index 9c137e0..ec7323a 100644
--- a/src/paclog-pkglist.sh.in
+++ b/src/paclog-pkglist.sh.in
@@ -95,5 +95,3 @@ END {
 		}
 	}
 }' | sort
-
-# vim: set noet:
diff --git a/src/pacsearch.pl.in b/src/pacsearch.pl.in
index 0f6b3ea..21b65aa 100644
--- a/src/pacsearch.pl.in
+++ b/src/pacsearch.pl.in
@@ -121,5 +121,3 @@ my %allpkgs = map {$_->[1] . $_->[2] => 1} @sync;
 my @query = grep { not $allpkgs{$_->[1] . $_->[2]}} list_pkg('-Qs', @ARGV);
 $_->[4] = " [$LC_INSTALLED]" foreach @query;
 print_pkg (@{$_}) foreach (@sync, @query);
-
-#vim: set noet:
diff --git a/src/pacsort.c b/src/pacsort.c
index e9e49e3..20d2f12 100644
--- a/src/pacsort.c
+++ b/src/pacsort.c
@@ -563,5 +563,3 @@ cleanup:
 
 	return ret;
 }
-
-/* vim: set noet: */
diff --git a/src/pactree.c b/src/pactree.c
index 9e6ac1b..23cffb3 100644
--- a/src/pactree.c
+++ b/src/pactree.c
@@ -665,5 +665,3 @@ int main(int argc, char *argv[])
 
 	cleanup(0);
 }
-
-/* vim: set noet: */
diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in
index c2f564b..9f728ee 100644
--- a/src/rankmirrors.sh.in
+++ b/src/rankmirrors.sh.in
@@ -240,5 +240,3 @@ for line in "${linearray[@]}"; do
 	fi
 done
 finaloutput
-
-# vim: set noet:
diff --git a/src/updpkgsums.sh.in b/src/updpkgsums.sh.in
index e5dbd2b..d6a8f57 100644
--- a/src/updpkgsums.sh.in
+++ b/src/updpkgsums.sh.in
@@ -122,5 +122,3 @@ awk -v sumtypes="$sumtypes" -v newsums="$newsums" '
 if ! cat -- "$newbuildfile" >"$buildfile"; then
 	die "Failed to update %s. The file has not been modified." "$buildfile"
 fi
-
-# vim: set noet:
diff --git a/src/vim/syntax/PKGBUILD.vim b/src/vim/syntax/PKGBUILD.vim
index 32b38bb..0676701 100644
--- a/src/vim/syntax/PKGBUILD.vim
+++ b/src/vim/syntax/PKGBUILD.vim
@@ -346,5 +346,3 @@ hi def link pb_k_maintainer pbKeywords
 hi def link pbKeywords Keyword
 
 hi def link pbDate Special
-
-"let b:current_syntax = 'PKGBUILD'
diff --git a/test/pacsorttest.sh b/test/pacsorttest.sh
index 380d1dc..6383615 100755
--- a/test/pacsorttest.sh
+++ b/test/pacsorttest.sh
@@ -109,5 +109,3 @@ tap_runtest "$separator_reverse" "$separator_reverse" "really long input, sort k
 tap_runtest "$separator" "$separator_reverse" "really long input, sort key, separator, reversed" "-k 3 -t| -r"
 
 tap_finish
-
-# vim: set noet: