Merge branch 'editorconfig' into 'master'

Switch to EditorConfig from Vim modelines

See merge request !9

.editorconfig

+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

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

configure.ac

@@ -196,5 +196,3 @@ ${PACKAGE_NAME}:
     extra warning flags    : ${warningflags}
     use git version        : ${wantgitver}
 "
-
-# vim:set noet:

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

doc/checkupdates.8.txt → doc/checkupdates.8.adoc

-/////
-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[]

doc/contributing.txt → 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:
-/////

doc/footer.txt → doc/footer.adoc

-/////
-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>

doc/paccache.8.txt → doc/paccache.8.adoc

-/////
-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[]

doc/pacdiff.8.txt → doc/pacdiff.8.adoc

-/////
-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[]

doc/pacsort.8.txt → doc/pacsort.8.adoc

-/////
-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[]

doc/pactree.8.txt → doc/pactree.8.adoc

-/////
-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[]

doc/release-procedure.txt → 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:
-/////

doc/updpkgsums.8.txt → doc/updpkgsums.8.adoc

-/////
-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[]

lib/Makefile.am

@@ -4,5 +4,3 @@ DIST_SUBDIRS = $(SUBDIRS)
 
 EXTRA_DIST = \
 	size_to_human.sh
-
-# vim:set noet:

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:

src/checkupdates.sh.in

@@ -133,5 +133,3 @@ if (( ${#updates[@]} )); then
 else
 	exit 2
 fi
-
-# vim: set noet:

src/paccache.sh.in

@@ -406,5 +406,3 @@ elif (( move )); then
 fi
 
 summarize "$pkgcount" "${candidates[@]}"
-
-# vim: set noet:

src/pacdiff.sh.in

@@ -288,5 +288,3 @@ done 3< <(cmd)
 (( ${#oldsaves[@]} )) && warning "Ignoring %s" "${oldsaves[@]}"
 
 exit 0
-
-# vim: set noet:

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:

src/paclog-pkglist.sh.in

@@ -95,5 +95,3 @@ END {
 		}
 	}
 }' | sort
-
-# vim: set noet: