Many of these are pointless (e.g. there is no need to explicitly turn on spellchecking and language dictionaries for the manpages by default). The only useful modelines are the ones enforcing the project coding standards for indentation style (and "maybe" filetype/syntax, but everything except the asciidoc manpages and makepkg.conf is already autodetected), and indent style can be applied more easily with .editorconfig Signed-off-by: Eli Schwartz --- HACKING | 4 ---- Makefile.am | 2 -- NEWS | 2 -- configure.ac | 2 -- doc/Makefile.am | 2 -- doc/PKGBUILD.5.txt | 3 --- doc/alpm-hooks.5.txt | 3 --- doc/footer.txt | 3 --- doc/index.txt | 4 ---- doc/libalpm.3.txt | 3 --- doc/makepkg-template.1.txt | 3 --- doc/makepkg.8.txt | 3 --- doc/makepkg.conf.5.txt | 3 --- doc/pacman-key.8.txt | 3 --- doc/pacman.8.txt | 3 --- doc/pacman.conf.5.txt | 3 --- doc/pkgdelta.8.txt | 3 --- doc/repo-add.8.txt | 3 --- doc/submitting-patches.txt | 4 ---- doc/translation-help.txt | 4 ---- doc/vercmp.8.txt | 3 --- etc/Makefile.am | 2 -- etc/makepkg.conf.in | 2 -- lib/libalpm/Makefile.am | 2 -- lib/libalpm/add.c | 2 -- lib/libalpm/add.h | 2 -- lib/libalpm/alpm.c | 2 -- lib/libalpm/alpm.h | 2 -- lib/libalpm/alpm_list.c | 2 -- lib/libalpm/alpm_list.h | 2 -- lib/libalpm/backup.c | 2 -- lib/libalpm/backup.h | 2 -- lib/libalpm/be_local.c | 2 -- lib/libalpm/be_package.c | 2 -- lib/libalpm/be_sync.c | 2 -- lib/libalpm/conflict.c | 2 -- lib/libalpm/conflict.h | 2 -- lib/libalpm/db.c | 2 -- lib/libalpm/db.h | 2 -- lib/libalpm/delta.c | 2 -- lib/libalpm/delta.h | 2 -- lib/libalpm/deps.c | 1 - lib/libalpm/deps.h | 2 -- lib/libalpm/diskspace.c | 2 -- lib/libalpm/diskspace.h | 2 -- lib/libalpm/dload.c | 2 -- lib/libalpm/dload.h | 2 -- lib/libalpm/error.c | 2 -- lib/libalpm/filelist.c | 2 -- lib/libalpm/filelist.h | 2 -- lib/libalpm/graph.c | 2 -- lib/libalpm/graph.h | 2 -- lib/libalpm/group.c | 2 -- lib/libalpm/group.h | 2 -- lib/libalpm/handle.c | 2 -- lib/libalpm/handle.h | 2 -- lib/libalpm/hook.c | 2 -- lib/libalpm/hook.h | 2 -- lib/libalpm/libarchive-compat.h | 2 -- lib/libalpm/log.c | 2 -- lib/libalpm/log.h | 2 -- lib/libalpm/package.c | 2 -- lib/libalpm/package.h | 2 -- lib/libalpm/pkghash.c | 2 -- lib/libalpm/rawstr.c | 2 -- lib/libalpm/remove.c | 2 -- lib/libalpm/remove.h | 2 -- lib/libalpm/signing.c | 2 -- lib/libalpm/signing.h | 2 -- lib/libalpm/sync.c | 2 -- lib/libalpm/sync.h | 2 -- lib/libalpm/trans.c | 1 - lib/libalpm/trans.h | 2 -- lib/libalpm/util.c | 2 -- lib/libalpm/util.h | 2 -- lib/libalpm/version.c | 2 -- scripts/Makefile.am | 3 --- scripts/makepkg-template.pl.in | 2 -- scripts/makepkg.sh.in | 2 -- scripts/pacman-db-upgrade.sh.in | 2 -- scripts/pacman-key.sh.in | 2 -- scripts/pkgdelta.sh.in | 2 -- scripts/repo-add.sh.in | 1 - src/common/Makefile.am | 2 -- src/common/ini.c | 2 -- src/common/ini.h | 2 -- src/common/util-common.c | 2 -- src/common/util-common.h | 2 -- src/pacman/Makefile.am | 3 --- src/pacman/callback.c | 2 -- src/pacman/callback.h | 2 -- src/pacman/check.c | 2 -- src/pacman/check.h | 2 -- src/pacman/conf.c | 2 -- src/pacman/conf.h | 2 -- src/pacman/database.c | 2 -- src/pacman/deptest.c | 2 -- src/pacman/files.c | 2 -- src/pacman/package.c | 2 -- src/pacman/package.h | 2 -- src/pacman/pacman.c | 2 -- src/pacman/pacman.h | 2 -- src/pacman/query.c | 2 -- src/pacman/remove.c | 2 -- src/pacman/sighandler.c | 2 -- src/pacman/sighandler.h | 2 -- src/pacman/sync.c | 2 -- src/pacman/upgrade.c | 2 -- src/pacman/util.c | 2 -- src/pacman/util.h | 2 -- src/util/Makefile.am | 2 -- src/util/cleanupdelta.c | 2 -- test/pacman/Makefile.am | 2 -- test/pacman/pactest.py | 2 -- test/pacman/pmdb.py | 2 -- test/pacman/pmenv.py | 2 -- test/pacman/pmfile.py | 2 -- test/pacman/pmpkg.py | 2 -- test/pacman/pmrule.py | 2 -- test/pacman/pmtest.py | 2 -- test/pacman/tests/Makefile.am | 2 -- test/pacman/util.py | 2 -- test/scripts/Makefile.am | 2 -- test/scripts/human_to_size_test.sh | 2 -- test/scripts/parseopts_test.sh | 2 -- test/tap.sh | 2 -- test/util/Makefile.am | 2 -- test/util/vercmptest.sh | 2 -- 128 files changed, 276 deletions(-) diff --git a/HACKING b/HACKING index 962a5f96..e32938cf 100644 --- a/HACKING +++ b/HACKING @@ -194,7 +194,3 @@ For example, to run valgrind: ./src/pacman/pacman valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu - -///// -vim:set syntax=asciidoc noet spell spelllang=en_us: -///// diff --git a/Makefile.am b/Makefile.am index 67ffc6b4..85be82b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,5 +69,3 @@ update-copyright: done .PHONY: update-po update-copyright - -# vim:set noet: diff --git a/NEWS b/NEWS index b7298bfb..bd1c557a 100644 --- a/NEWS +++ b/NEWS @@ -1258,5 +1258,3 @@ VERSION DESCRIPTION backed up, then it will be copied to "file.save" - Changed db_find_conflicts() to ignore directories 1.0 - Initial Release - -vim: set et spell spelllang=en_us: diff --git a/configure.ac b/configure.ac index 4d2f7d34..a820b6de 100644 --- a/configure.ac +++ b/configure.ac @@ -594,5 +594,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 bbf2af66..3eff9194 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -176,5 +176,3 @@ install-data-hook: uninstall-hook: $(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8 - -# vim:set noet: diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index cbd02e88..795dde45 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// PKGBUILD(5) =========== diff --git a/doc/alpm-hooks.5.txt b/doc/alpm-hooks.5.txt index 7c523e2d..eb56054e 100644 --- a/doc/alpm-hooks.5.txt +++ b/doc/alpm-hooks.5.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// alpm-hooks(5) ============= diff --git a/doc/footer.txt b/doc/footer.txt index 12b07150..5812aa72 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// See the pacman website at https://www.archlinux.org/pacman/[] for current information on pacman and its related tools. diff --git a/doc/index.txt b/doc/index.txt index 6461e34f..48510830 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -259,7 +259,3 @@ pacman is Copyright (C) 2006-2018 Pacman Development Team and Copyright (C) 2002-2006 Judd Vinet and is licensed through the GNU General Public License, version 2 or later. - -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index aa667a11..e75fb880 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// libalpm(3) ========== diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt index 99637d43..fcb19b07 100644 --- a/doc/makepkg-template.1.txt +++ b/doc/makepkg-template.1.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// makepkg-template(1) =================== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index a065b795..58e9b27a 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 267dc9e9..a9246af5 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// makepkg.conf(5) =============== diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 3c947f7a..0b46f919 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// pacman-key(8) ============= diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a395b777..ebe16e61 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index f401193f..db8fe740 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// pacman.conf(5) ============== diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt index 49b3460b..6d93a67a 100644 --- a/doc/pkgdelta.8.txt +++ b/doc/pkgdelta.8.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// pkgdelta(8) ========= diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 564ee758..4c6d8d5a 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// repo-add(8) ========== diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index 77ec771f..73c7487d 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -99,7 +99,3 @@ aren't their own. When resubmitting patches, update the subject line to reflect the version number ('[PATCHv2]'), and send it as a reply to the original thread. -- - -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 99ce3d82..67117bcc 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -151,7 +151,3 @@ the pacman codebase. However, this is not to say translations are unwelcome. If someone has experience with i18n man pages and how to best include them with our source, please contact the pacman-dev mailing list at mailto:pacman-dev@archlinux.org[]. - -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index 18819953..f8328a6b 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// vercmp(8) ========= diff --git a/etc/Makefile.am b/etc/Makefile.am index 5363f429..0d4fbc07 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -25,5 +25,3 @@ SED_PROCESS = \ %.conf: %.conf.in Makefile $(SED_PROCESS) - -# vim:set noet: diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index fe3858ad..3c3d4767 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -141,5 +141,3 @@ COMPRESSZ=(compress -c -f) # PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' - -# vim: set ft=sh ts=2 sw=2 et: diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index f4f20e61..8201dcbd 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -75,5 +75,3 @@ libalpm_la_LIBADD = \ $(LIBCURL_LIBS) \ $(LIBSSL_LIBS) \ $(NETTLE_LIBS) - -# vim:set noet: diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index e193ae0f..5a3e06b8 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -694,5 +694,3 @@ int _alpm_upgrade_packages(alpm_handle_t *handle) return ret; } - -/* vim: set noet: */ diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index 7c93843e..e9125c78 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -27,5 +27,3 @@ int _alpm_upgrade_packages(alpm_handle_t *handle); #endif /* ALPM_ADD_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index f5114e13..0f3db6f4 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -166,5 +166,3 @@ int SYMEXPORT alpm_capabilities(void) #endif | 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 02d5e584..57226ebd 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1646,5 +1646,3 @@ void alpm_conflict_free(alpm_conflict_t *conflict); } #endif #endif /* ALPM_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 8a907ff2..f2b10be4 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -842,5 +842,3 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n, } /** @} */ - -/* vim: set noet: */ diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index aa79e69e..8a2c5b2b 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -92,5 +92,3 @@ void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size); } #endif #endif /* ALPM_LIST_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 3e42b585..6640c5e6 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -98,5 +98,3 @@ error: free(newbackup); return NULL; } - -/* vim: set noet: */ diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 1580426b..00e39b40 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -29,5 +29,3 @@ void _alpm_backup_free(alpm_backup_t *backup); alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup); #endif /* ALPM_BACKUP_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2b4d9330..7c2f96b8 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1166,5 +1166,3 @@ alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle) handle->db_local = db; return db; } - -/* vim: set noet: */ diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 9daf28af..ac911bdb 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -788,5 +788,3 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 0ccb7209..5009a7da 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -805,5 +805,3 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, handle->dbs_sync = alpm_list_add(handle->dbs_sync, db); return db; } - -/* vim: set noet: */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 16ad19ab..35946de5 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -700,5 +700,3 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, return conflicts; } - -/* vim: set noet: */ diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index a2cdd171..2deff79b 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -31,5 +31,3 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *upgrade, alpm_list_t *remove); #endif /* ALPM_CONFLICT_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 35045fe5..aa7f2af7 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -726,5 +726,3 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target) return NULL; } - -/* vim: set noet: */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 1cb737ab..60062056 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -112,5 +112,3 @@ alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db); alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target); #endif /* ALPM_DB_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index d8e696dc..33da4a3f 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -359,5 +359,3 @@ error: _alpm_delta_free(newdelta); return NULL; } - -/* vim: set noet: */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index c9d57c89..d80c0745 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -31,5 +31,3 @@ off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas, const char *to, alpm_list_t **path); #endif /* ALPM_DELTA_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 20ec9bc4..71185c68 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -954,4 +954,3 @@ char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep) return str; } -/* vim: set noet: */ diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index c707998e..788b4573 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -39,5 +39,3 @@ int _alpm_depcmp_provides(alpm_depend_t *dep, alpm_list_t *provisions); int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep); #endif /* ALPM_DEPS_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 25204f17..00745a9a 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -500,5 +500,3 @@ finish: return 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index ffc819b3..8100dd6f 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -61,5 +61,3 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir, size_t num_files, off_t *file_sizes); #endif /* ALPM_DISKSPACE_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index f06caad8..eeef32f5 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -734,5 +734,3 @@ void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload) payload->unlink_on_fail = 0; payload->cb_initialized = 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index d69d5926..20a1ff3c 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -54,5 +54,3 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, char **final_file, const char **final_url); #endif /* ALPM_DLOAD_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 28b2e36d..b4fc99ae 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -164,5 +164,3 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("unexpected error"); } } - -/* vim: set noet: */ diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 1048a4a1..0d01c0f6 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -145,5 +145,3 @@ void _alpm_filelist_sort(alpm_filelist_t *filelist) } } } - -/* vim: set noet: */ diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h index 04a005fe..0b0de37e 100644 --- a/lib/libalpm/filelist.h +++ b/lib/libalpm/filelist.h @@ -30,5 +30,3 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA, void _alpm_filelist_sort(alpm_filelist_t *filelist); #endif /* ALPM_FILELIST_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index c0b8162a..98c2227f 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -36,5 +36,3 @@ void _alpm_graph_free(void *data) alpm_list_free(graph->children); free(graph); } - -/* vim: set noet: */ diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index 98ae16ea..d8d9ae4c 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -42,5 +42,3 @@ alpm_graph_t *_alpm_graph_new(void); void _alpm_graph_free(void *data); #endif /* ALPM_GRAPH_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 2808d8f1..9b6e7f21 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -49,5 +49,3 @@ void _alpm_group_free(alpm_group_t *grp) alpm_list_free(grp->packages); FREE(grp); } - -/* vim: set noet: */ diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index ef46adee..3b7a4644 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -26,5 +26,3 @@ alpm_group_t *_alpm_group_new(const char *name); void _alpm_group_free(alpm_group_t *grp); #endif /* ALPM_GROUP_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2bd360bf..2213ce53 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -876,5 +876,3 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, #endif return 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a7807cad..44c4904b 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -126,5 +126,3 @@ alpm_errno_t _alpm_set_directory_option(const char *value, char **storage, int must_exist); #endif /* ALPM_HANDLE_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 89018c4f..0805e661 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -782,5 +782,3 @@ cleanup: return ret; } - -/* vim: set noet: */ diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h index d7835d87..364d22d7 100644 --- a/lib/libalpm/hook.h +++ b/lib/libalpm/hook.h @@ -25,5 +25,3 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when); #endif /* ALPM_HOOK_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h index d65e141d..6cf8e0ad 100644 --- a/lib/libalpm/libarchive-compat.h +++ b/lib/libalpm/libarchive-compat.h @@ -69,5 +69,3 @@ static inline int _alpm_archive_read_support_filter_all(struct archive *archive) } #endif /* LIBARCHIVE_COMPAT_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 1a1f6b49..e46ad3c3 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -121,5 +121,3 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ... handle->logcb(flag, fmt, args); va_end(args); } - -/* vim: set noet: */ diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index 730ce012..a82cda41 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -28,5 +28,3 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...) __attribute__((format(printf,3,4))); #endif /* ALPM_LOG_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index b9fef335..97a78781 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -805,5 +805,3 @@ int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) return 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index cab41618..b11d5dda 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -161,5 +161,3 @@ int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); #endif /* ALPM_PACKAGE_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 1d983916..4ae9541c 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -349,5 +349,3 @@ alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name) return NULL; } - -/* vim: set noet: */ diff --git a/lib/libalpm/rawstr.c b/lib/libalpm/rawstr.c index f3f81f5a..96d3a911 100644 --- a/lib/libalpm/rawstr.c +++ b/lib/libalpm/rawstr.c @@ -133,5 +133,3 @@ int _alpm_raw_ncmp(const char *first, const char *second, size_t max) return (raw_toupper(*first) - raw_toupper(*second)); } - -/* vim: set noet: */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a83710ed..5b53ac34 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -779,5 +779,3 @@ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig) return ret; } - -/* vim: set noet: */ diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index 6252eeb7..67993bfc 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -32,5 +32,3 @@ int _alpm_remove_single_package(alpm_handle_t *handle, size_t targ_count, size_t pkg_count); #endif /* ALPM_REMOVE_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 76641274..df7ac6ca 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -1174,5 +1174,3 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, return 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 2f25f00d..f8b84b94 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -35,5 +35,3 @@ int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); int _alpm_key_import(alpm_handle_t *handle, const char *fpr); #endif /* ALPM_SIGNING_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a4d21a00..696a5131 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1417,5 +1417,3 @@ int _alpm_sync_commit(alpm_handle_t *handle) return 0; } - -/* vim: set noet: */ diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index b4dd124c..f9c61491 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -30,5 +30,3 @@ int _alpm_sync_check(alpm_handle_t *handle, alpm_list_t **data); int _alpm_sync_commit(alpm_handle_t *handle); #endif /* ALPM_SYNC_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index af964832..4d97921f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -445,4 +445,3 @@ alpm_list_t SYMEXPORT *alpm_trans_get_remove(alpm_handle_t *handle) return handle->trans->remove; } -/* vim: set noet: */ diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index a3b1c3b9..f9a87ee7 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -53,5 +53,3 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, const char *script, const char *ver, const char *oldver, int is_archive); #endif /* ALPM_TRANS_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 102a879a..a06f5bfd 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1463,5 +1463,3 @@ void _alpm_alloc_fail(size_t size) { fprintf(stderr, "alloc failure: could not allocate %zu bytes\n", size); } - -/* vim: set noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 072799b8..9a3942f1 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -159,5 +159,3 @@ char *strsep(char **, const char *); #define UNUSED __attribute__((unused)) #endif /* ALPM_UTIL_H */ - -/* vim: set noet: */ diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 1379e6b3..ac7f09c0 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -272,5 +272,3 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) free(full2); return ret; } - -/* vim: set noet: */ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 17e54eff..f759e149 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -289,6 +289,3 @@ uninstall-hook: for dir in $(LIBMAKEPKGDIRS); do \ $(RM) -r $(DESTDIR)$(libmakepkgdir)/$$dir; \ done - - -# vim:set noet: diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 918d58c9..e485dec4 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -213,5 +213,3 @@ $opts{input} = "/dev/stdin" if $opts{input} eq "-"; $opts{output} = "/dev/stdout" if $opts{output} eq "-"; burp($opts{output}, process_file($opts{input})); - -# vim: set noet: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eee8a56c..13a8e7b3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1693,5 +1693,3 @@ fi msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date +%c))" install_package && exit $E_OK || exit $E_INSTALL_FAILED - -# vim: set noet: diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 9d447cbc..9f27a2a2 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -240,5 +240,3 @@ echo "9" > "$dbroot"/local/ALPM_DB_VERSION # remove the lock file rm -f "$lockfile" - -# vim: set noet: diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 060d8369..ff460363 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -636,5 +636,3 @@ fi (( UPDATEDB )) && updatedb exit 0 - -# vim: set noet: diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 4500dd75..2dc12c28 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -227,5 +227,3 @@ if ! type xdelta3 &>/dev/null; then fi create_xdelta "$@" - -# vim: set noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4b3a03ea..8ab0099b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -829,4 +829,3 @@ else fi exit 0 -# vim: set noet: diff --git a/src/common/Makefile.am b/src/common/Makefile.am index ba402b2d..c0e37273 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,4 +1,2 @@ EXTRA_DIST = \ util-common.h util-common.c - -# vim:set noet: diff --git a/src/common/ini.c b/src/common/ini.c index ae5d555d..9d656781 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -107,5 +107,3 @@ cleanup: free(section_name); return ret; } - -/* vim: set noet: */ diff --git a/src/common/ini.h b/src/common/ini.h index 22dbed91..6d2b264a 100644 --- a/src/common/ini.h +++ b/src/common/ini.h @@ -26,5 +26,3 @@ typedef int (ini_parser_fn)(const char *file, int line, const char *section, int parse_ini(const char *file, ini_parser_fn cb, void *data); #endif /* PM_INI_H */ - -/* vim: set noet: */ diff --git a/src/common/util-common.c b/src/common/util-common.c index f45524b0..3aa0eac9 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -197,5 +197,3 @@ char *strndup(const char *s, size_t n) return (char *)memcpy(new, s, len); } #endif - -/* vim: set noet: */ diff --git a/src/common/util-common.h b/src/common/util-common.h index 5e886c82..3434e1eb 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -39,5 +39,3 @@ char *strndup(const char *s, size_t n); #define ARRAYSIZE(a) (sizeof (a) / sizeof (a[0])) #endif /* PM_UTIL_COMMON_H */ - -/* vim: set noet: */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index a1adfcaa..2344daff 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -65,6 +65,3 @@ pacman_conf_SOURCES = pacman-conf.c \ conf.c pacman_conf_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la - - -# vim:set noet: diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 1756d624..ee75297c 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -884,5 +884,3 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) pm_vfprintf(stderr, level, fmt, args); } } - -/* vim: set noet: */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 555c396d..e49f86dd 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -44,5 +44,3 @@ __attribute__((format(printf, 2, 0))) void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); #endif /* PM_CALLBACK_H */ - -/* vim: set noet: */ diff --git a/src/pacman/check.c b/src/pacman/check.c index 9b61a1ed..62c0ca8e 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -390,5 +390,3 @@ int check_pkg_full(alpm_pkg_t *pkg) return (errors != 0 ? 1 : 0); } - -/* vim: set noet: */ diff --git a/src/pacman/check.h b/src/pacman/check.h index a3930b6b..d9fd6902 100644 --- a/src/pacman/check.h +++ b/src/pacman/check.h @@ -26,5 +26,3 @@ int check_pkg_fast(alpm_pkg_t *pkg); int check_pkg_full(alpm_pkg_t *pkg); #endif /* PM_CHECK_H */ - -/* vim: set noet: */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 4ca97d86..9a37dcea 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -1073,5 +1073,3 @@ int parseconfig(const char *file) config->repos = NULL; return ret; } - -/* vim: set noet: */ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 39488062..ababf2e0 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -245,5 +245,3 @@ int parseconfig(const char *file); int parseconfigfile(const char *file); int setdefaults(config_t *c); #endif /* PM_CONF_H */ - -/* vim: set noet: */ diff --git a/src/pacman/database.c b/src/pacman/database.c index f8c7ef62..f3b890ce 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -300,5 +300,3 @@ int pacman_database(alpm_list_t *targets) return ret; } - -/* vim: set noet: */ diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 09da1a67..597eee42 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -53,5 +53,3 @@ int pacman_deptest(alpm_list_t *targets) alpm_list_free(deps); return 127; } - -/* vim: set noet: */ diff --git a/src/pacman/files.c b/src/pacman/files.c index 79feec74..d7fc5446 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -323,5 +323,3 @@ int pacman_files(alpm_list_t *targets) return 0; } - -/* vim: set noet: */ diff --git a/src/pacman/package.c b/src/pacman/package.c index be5456aa..e80c5953 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -568,5 +568,3 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status) return 0; } - -/* vim: set noet: */ diff --git a/src/pacman/package.h b/src/pacman/package.h index 983fd822..68c2a630 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -32,5 +32,3 @@ void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg); int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status); #endif /* PM_PACKAGE_H */ - -/* vim: set noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b1ef163b..fe54793e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1304,5 +1304,3 @@ int main(int argc, char *argv[]) /* not reached */ return EXIT_SUCCESS; } - -/* vim: set noet: */ diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 05febffc..50ecc110 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -41,5 +41,3 @@ int sync_prepare_execute(void); int pacman_upgrade(alpm_list_t *targets); #endif /* PM_PACMAN_H */ - -/* vim: set noet: */ diff --git a/src/pacman/query.c b/src/pacman/query.c index c1ea855d..00c39638 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -511,5 +511,3 @@ int pacman_query(alpm_list_t *targets) return ret; } - -/* vim: set noet: */ diff --git a/src/pacman/remove.c b/src/pacman/remove.c index bca4910e..a2269ed8 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -186,5 +186,3 @@ cleanup: } return retval; } - -/* vim: set noet: */ diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index f59d23f5..ebcdebae 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -115,5 +115,3 @@ void install_winch_handler(void) new_action.sa_flags = SA_RESTART; sigaction(SIGWINCH, &new_action, NULL); } - -/* vim: set noet: */ diff --git a/src/pacman/sighandler.h b/src/pacman/sighandler.h index ee2be333..24393c74 100644 --- a/src/pacman/sighandler.h +++ b/src/pacman/sighandler.h @@ -26,5 +26,3 @@ void install_soft_interrupt_handler(void); void remove_soft_interrupt_handler(void); #endif /* PM_SIGHANDLER_H */ - -/* vim: set noet: */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6453e5e4..3c6be89d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -942,5 +942,3 @@ int pacman_sync(alpm_list_t *targets) return sync_trans(targets); } - -/* vim: set noet: */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index b1675a6f..8c63c124 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -129,5 +129,3 @@ fail_free: return retval; } - -/* vim: set noet: */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 4bcc0362..74e1037d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1771,5 +1771,3 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list ret = vfprintf(stream, format, args); return ret; } - -/* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index ab1dbb72..a1fbef46 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -84,5 +84,3 @@ int pm_sprintf(char **string, alpm_loglevel_t level, const char *format, ...) __ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); #endif /* PM_UTIL_H */ - -/* vim: set noet: */ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 562151bc..470c79f5 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -26,5 +26,3 @@ testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la vercmp_SOURCES = vercmp.c vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm_la-version.lo - -# vim:set noet: diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index b1f024c5..34e09c52 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -133,5 +133,3 @@ int main(int argc, char *argv[]) cleanup(0); } - -/* vim: set noet: */ diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index f71333c4..a36908a7 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -19,5 +19,3 @@ EXTRA_DIST = \ ChangeLog \ ldconfig.stub \ $(check_SCRIPTS) - -# vim:set noet: diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index b251ef45..1f5b8483 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -162,5 +162,3 @@ def create_parser(): if env.failed > 0: sys.exit(1) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 1c425458..f7671987 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -257,5 +257,3 @@ def generate(self): serverpath = os.path.join(self.root, util.SYNCREPO, self.treename) util.mkdir(serverpath) shutil.copy(self.dbfile, serverpath) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index bf19ceaa..f1d626d3 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -69,5 +69,3 @@ def run(self): tap.diag("==> Checking rules") tap.todo = t.expectfailure tap.subtest(lambda: t.check(), t.description) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pmfile.py b/test/pacman/pmfile.py index af37e9f2..f7204d68 100644 --- a/test/pacman/pmfile.py +++ b/test/pacman/pmfile.py @@ -80,5 +80,3 @@ def ismodified(self): return True return False - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index db81225c..5a32ccd6 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -221,5 +221,3 @@ def installfile(self): data.append("%s() {\n%s\n}\n" % (key, value)) return "\n".join(data) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 923ccde9..bdd0fcaa 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -189,5 +189,3 @@ def check(self, test): success = not success self.result = success return success - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 0f0f84e0..00012ac6 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -323,5 +323,3 @@ def cachedir(self): def hookdir(self): return os.path.join(self.root, util.PM_HOOKDIR) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index b541b3d6..ba3d0993 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -3,5 +3,3 @@ check_SCRIPTS = $(wildcard *.py) noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = $(check_SCRIPTS) - -# vim:set noet: diff --git a/test/pacman/util.py b/test/pacman/util.py index f84a6ae0..5fbe4c35 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -185,5 +185,3 @@ def mkdir(path): elif os.path.isfile(path): raise OSError("'%s' already exists and is not a directory" % path) os.makedirs(path, 0o755) - -# vim: set ts=4 sw=4 et: diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index ed1a9511..450a278d 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -8,5 +8,3 @@ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ $(check_SCRIPTS) - -# vim:set noet: diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 6334495f..fe9a94ba 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -53,5 +53,3 @@ tap_parse_hts '1M' 1048576 tap_parse_hts ' 1 G ' 1073741824 tap_parse_hts '1Q' '' - -# vim: set noet: diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index a5821986..9674c6a6 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -112,5 +112,3 @@ tap_parse '--force --' 2 --force tap_parse '--clean foo --' 3 --clean=foo tap_finish - -# vim: set noet: diff --git a/test/tap.sh b/test/tap.sh index 38852691..894d49ca 100644 --- a/test/tap.sh +++ b/test/tap.sh @@ -159,5 +159,3 @@ tap_diff() { fi return $ret } - -# vim: ft=sh diff --git a/test/util/Makefile.am b/test/util/Makefile.am index 27ef49f1..92824e8c 100644 --- a/test/util/Makefile.am +++ b/test/util/Makefile.am @@ -5,5 +5,3 @@ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ $(check_SCRIPTS) - -# vim:set noet: diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 18eeb37a..1541e7ae 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -114,5 +114,3 @@ tap_runtest 1:1.0 1.1 1 tap_runtest 1:1.1 1.1 1 tap_finish - -# vim: set noet: -- 2.17.0

Signed-off-by: Eli Schwartz --- .editorconfig | 20 ++++++++++++++++++++ HACKING | 9 ++------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..273eef48 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# EditorConfig configuration for pacman +# http://EditorConfig.org + +# Top-most EditorConfig file +root = true + +# Unix-style newlines without trailing whitespaces, but with a newline +# ending every file, utf-8 charset, set indent to tabs +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = tab + +[NEWS,HACKING] +indent_style = space + +[*.py] +indent_style = space diff --git a/HACKING b/HACKING index e32938cf..009a4682 100644 --- a/HACKING +++ b/HACKING @@ -11,13 +11,8 @@ Coding Style 1. All code should be indented with tabs. (Ignore the use of only spaces in this file.) A tab size of two spaces is used when calculating line widths, - which should be a maximum of 80 characters. By default, source files - contain the following Vim modeline: -+ -[source,C] -------------------------------------------- -/* vim: set noet: */ -------------------------------------------- + which should be a maximum of 80 characters. An EditorConfig file is used + to set this project-wide default. 2. When opening new blocks such as 'while', 'if', or 'for', leave the opening brace on the same line as the beginning of the codeblock. The closing brace -- 2.17.0