Forcing vim users to view files with a tabstop of 2 seems really unnecessary when noet is set. I find it much easier to read code with ts=4 and I dislike having to override the modeline by hand. Command run: find . -type f -exec sed -i '/vim.* noet/s# ts=2 sw=2##' {} + Signed-off-by: Florian Pritz --- HACKING | 4 ++-- Makefile.am | 2 +- configure.ac | 2 +- contrib/Makefile.am | 2 +- contrib/bacman.sh.in | 2 +- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 2 +- contrib/pacdiff.sh.in | 2 +- contrib/paclist.sh.in | 2 +- contrib/paclog-pkglist.sh.in | 2 +- contrib/pacsysclean.sh.in | 2 +- contrib/rankmirrors.sh.in | 2 +- contrib/updpkgsums.sh.in | 2 +- doc/Makefile.am | 2 +- etc/Makefile.am | 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 | 2 +- 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/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 | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/common/Makefile.am | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/Makefile.am | 2 +- 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/ini.c | 2 +- src/pacman/ini.h | 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/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 +- src/util/pacsort.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- test/pacman/Makefile.am | 2 +- test/pacman/tests/Makefile.am | 2 +- test/scripts/Makefile.am | 2 +- test/util/Makefile.am | 2 +- 106 files changed, 107 insertions(+), 107 deletions(-) diff --git a/HACKING b/HACKING index 1344644..cc4983f 100644 --- a/HACKING +++ b/HACKING @@ -14,7 +14,7 @@ Coding Style + [source,C] ------------------------------------------- -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ ------------------------------------------- 2. When opening new blocks such as 'while', 'if', or 'for', leave the opening @@ -202,5 +202,5 @@ For example, to run valgrind: valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/Makefile.am b/Makefile.am index 4d5adae..430abfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,4 +59,4 @@ update-po: .PHONY: update-po -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/configure.ac b/configure.ac index cfcc8d1..9f29069 100644 --- a/configure.ac +++ b/configure.ac @@ -556,4 +556,4 @@ ${PACKAGE_NAME}: use git version : ${wantgitver} " -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 99baf95..f6ca3f1 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -107,4 +107,4 @@ rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in zsh_completion: $(srcdir)/zsh_completion.in -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 222b0f8..3284cf4 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -355,4 +355,4 @@ msg "Done." exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 413b78a..06e1b12 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -48,4 +48,4 @@ pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 7c844bb..039ac8a 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -317,4 +317,4 @@ fi summarize "$pkgcount" "${candidates[@]}" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index cd5160c..42d3515 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -191,4 +191,4 @@ done 3< <(cmd) exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in index 319dcba..1c10b32 100644 --- a/contrib/paclist.sh.in +++ b/contrib/paclist.sh.in @@ -65,4 +65,4 @@ pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2,$3 }' # exit with pacman's return value, not awk's exit ${PIPESTATUS[0]} -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in index aaa7586..5d6f4be 100644 --- a/contrib/paclog-pkglist.sh.in +++ b/contrib/paclog-pkglist.sh.in @@ -96,4 +96,4 @@ END { } }' | sort -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in index 3631921..8f2eea3 100644 --- a/contrib/pacsysclean.sh.in +++ b/contrib/pacsysclean.sh.in @@ -63,4 +63,4 @@ function format_size(size) { printf("%s\t%s\n", format_size($2), $1); }' -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 453ebfb..7b50eb2 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -231,4 +231,4 @@ for line in "${linearray[@]}"; do done finaloutput -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 0f52db4..7e680b8 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -94,4 +94,4 @@ fi ' > "$buildfile" } < "$buildfile" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/doc/Makefile.am b/doc/Makefile.am index cb01255..a7908df 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -175,4 +175,4 @@ install-data-hook: uninstall-hook: $(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8 -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/etc/Makefile.am b/etc/Makefile.am index 7a1b91b..5363f42 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -26,4 +26,4 @@ SED_PROCESS = \ %.conf: %.conf.in Makefile $(SED_PROCESS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 171bc46..62c5d62 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -84,4 +84,4 @@ libalpm_la_LIBADD = \ $(LIBCURL_LIBS) \ $(LIBSSL_LIBS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 214e78e..5f1a953 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -731,4 +731,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index 2e1104f..1ad893e 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -28,4 +28,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle); #endif /* _ALPM_ADD_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 878c38b..86c4ec7 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -155,4 +155,4 @@ enum alpm_caps SYMEXPORT alpm_capabilities(void) | 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e9b0feb..b56bd7e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1359,4 +1359,4 @@ enum alpm_caps alpm_capabilities(void); #endif #endif /* _ALPM_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index a3c73aa..d297a03 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -790,4 +790,4 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n, /** @} */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 3f3566b..312e8fc 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -91,4 +91,4 @@ void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size); #endif #endif /* _ALPM_LIST_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 04168c5..ca85d1a 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -93,4 +93,4 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup) return newbackup; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 765195f..b35880f 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -30,4 +30,4 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup); #endif /* _ALPM_BACKUP_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2c18a45..b547b00 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1103,4 +1103,4 @@ alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle) return db; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index aaf60fe..149f281 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -612,4 +612,4 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 123d953..6a7f92f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -713,4 +713,4 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, return db; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 54ed25e..0cb5b28 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -636,4 +636,4 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, return conflicts; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 983ed39..7c3ea03 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -35,4 +35,4 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict); #endif /* _ALPM_CONFLICT_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 2069a7b..c3815b6 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -707,4 +707,4 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target) return NULL; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 4bb6ee9..d0ee729 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -108,4 +108,4 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target); #endif /* _ALPM_DB_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 2da1496..2197d6b 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -352,4 +352,4 @@ alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta) return newdelta; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 90a170c..b1d0a50 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -32,4 +32,4 @@ off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas, #endif /* _ALPM_DELTA_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e5a0404..de269b7 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -926,4 +926,4 @@ char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep) return str; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index d5ca236..a60175f 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -42,4 +42,4 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep); #endif /* _ALPM_DEPS_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index dcab3b0..4c1fb5d 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -491,4 +491,4 @@ finish: return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index 4d876d7..f460dc5 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -62,4 +62,4 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir, #endif /* _ALPM_DISKSPACE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c74d2ad..a3ddd98 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -749,4 +749,4 @@ void _alpm_dload_payload_reset(struct dload_payload *payload) memset(payload, '\0', sizeof(*payload)); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 6c9f7a7..02b41d4 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -53,4 +53,4 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, #endif /* _ALPM_DLOAD_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 8622180..e1b811f 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -163,4 +163,4 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) } } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index e6da681..744970a 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -145,4 +145,4 @@ alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist, sizeof(alpm_file_t), _alpm_files_cmp); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h index 66501f3..804de47 100644 --- a/lib/libalpm/filelist.h +++ b/lib/libalpm/filelist.h @@ -31,4 +31,4 @@ int _alpm_files_cmp(const void *f1, const void *f2); #endif /* _ALPM_FILELIST_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 81ee6fd..9042b57 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -36,4 +36,4 @@ void _alpm_graph_free(void *data) free(graph); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index bf06047..0cf261b 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -37,4 +37,4 @@ void _alpm_graph_free(void *data); #endif /* _ALPM_GRAPH_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 614dbaf..03ac2ce 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -50,4 +50,4 @@ void _alpm_group_free(alpm_group_t *grp) FREE(grp); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index b8cd3e1..3516fd2 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -27,4 +27,4 @@ void _alpm_group_free(alpm_group_t *grp); #endif /* _ALPM_GROUP_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 1d661a2..e3a4b6b 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -674,4 +674,4 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha } } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 4126e1a..d03ed27 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -116,4 +116,4 @@ alpm_errno_t _alpm_set_directory_option(const char *value, #endif /* _ALPM_HANDLE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h index 1e2e1e8..757f4a4 100644 --- a/lib/libalpm/libarchive-compat.h +++ b/lib/libalpm/libarchive-compat.h @@ -70,4 +70,4 @@ static inline int _alpm_archive_read_support_filter_all(struct archive *archive) #endif /* _LIBARCHIVE_COMPAT_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 271bd00..a13ee72 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -85,4 +85,4 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ... va_end(args); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index dd60c85..8796a8e 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -29,4 +29,4 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, #endif /* _ALPM_LOG_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 1294f8e..b2f9b1c 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -773,4 +773,4 @@ int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 07b043c..3a8ebf8 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -151,4 +151,4 @@ int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index acb1a1c..dec449e 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -348,4 +348,4 @@ alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name) return NULL; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/rawstr.c b/lib/libalpm/rawstr.c index 86f4280..f3f81f5 100644 --- a/lib/libalpm/rawstr.c +++ b/lib/libalpm/rawstr.c @@ -134,4 +134,4 @@ int _alpm_raw_ncmp(const char *first, const char *second, size_t max) return (raw_toupper(*first) - raw_toupper(*second)); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9417a61..9041bfb 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -765,4 +765,4 @@ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index cd53285..f79b383 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -33,4 +33,4 @@ int _alpm_remove_single_package(alpm_handle_t *handle, #endif /* _ALPM_REMOVE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index b594a9b..b436aad 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -1070,4 +1070,4 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 42b60b1..9404d74 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -36,4 +36,4 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr); #endif /* _ALPM_SIGNING_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e358585..5aca5df 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1317,4 +1317,4 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 82ed4be..54459e4 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -29,4 +29,4 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data); #endif /* _ALPM_SYNC_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index a795a1f..5e90a1c 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -389,4 +389,4 @@ alpm_list_t SYMEXPORT *alpm_trans_get_remove(alpm_handle_t *handle) return handle->trans->remove; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index f8ef045..95dc6b9 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -52,4 +52,4 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, #endif /* _ALPM_TRANS_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 40a5ebd..1bbc768 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1292,4 +1292,4 @@ void _alpm_alloc_fail(size_t size) fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index c12b39b..b566868 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -154,4 +154,4 @@ char *strsep(char **, const char *); #endif /* _ALPM_UTIL_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 59a7a4e..b3bb1a3 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -272,4 +272,4 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8130704..5d69993 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -161,4 +161,4 @@ uninstall-hook: cd $(DESTDIR)$(bindir) && \ $(RM) repo-remove repo-elephant -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 81354df..6404205 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3063,4 +3063,4 @@ install_package exit 0 #E_OK -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 2b39538..a9855d0 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -127,4 +127,4 @@ fi # remove the lock file rm -f "$lockfile" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 30fba10..94b3dda 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -627,4 +627,4 @@ fi exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index d13ce0e..df95501 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -186,4 +186,4 @@ echo exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index cc1f9ac..be49326 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -223,4 +223,4 @@ fi create_xdelta "$@" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index a9a4499..f77dd02 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -739,4 +739,4 @@ else fi exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4950333..ba402b2 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,4 +1,4 @@ EXTRA_DIST = \ util-common.h util-common.c -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/src/common/util-common.c b/src/common/util-common.c index e4a9de9..86a57d7 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -107,4 +107,4 @@ char *strndup(const char *s, size_t n) } #endif -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/common/util-common.h b/src/common/util-common.h index 04d4e9d..3ace915 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -29,4 +29,4 @@ char *strndup(const char *s, size_t n); #endif /* _PM_UTIL_COMMON_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index f7272c6..5f10308 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -44,4 +44,4 @@ pacman_SOURCES = \ LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a181fa5..e529ac2 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -783,4 +783,4 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) } } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index a291fc7..60bfeb9 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -46,4 +46,4 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); #endif /* _PM_CALLBACK_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/check.c b/src/pacman/check.c index f9166b0..b960938 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -363,4 +363,4 @@ int check_pkg_full(alpm_pkg_t *pkg) return (errors != 0 ? 1 : 0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/check.h b/src/pacman/check.h index 9f86a2a..c6b9534 100644 --- a/src/pacman/check.h +++ b/src/pacman/check.h @@ -27,4 +27,4 @@ int check_pkg_full(alpm_pkg_t *pkg); #endif /* _PM_CHECK_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cf8a417..7111eea 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -953,4 +953,4 @@ int parseconfig(const char *file) return parse_ini(file, _parse_directive, §ion); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index c2ed1ca..6adb687 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -209,4 +209,4 @@ int config_set_arch(const char *arch); int parseconfig(const char *file); #endif /* _PM_CONF_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/database.c b/src/pacman/database.c index 44bf3af..471b1a0 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -85,4 +85,4 @@ int pacman_database(alpm_list_t *targets) return retval; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index f3a9035..27a5402 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -54,4 +54,4 @@ int pacman_deptest(alpm_list_t *targets) return 127; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/ini.c b/src/pacman/ini.c index cd7741d..ac4c6e4 100644 --- a/src/pacman/ini.c +++ b/src/pacman/ini.c @@ -214,4 +214,4 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) return _parse_ini(file, cb, data, §ion_name, line, 0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/ini.h b/src/pacman/ini.h index 4d403c1..dac4e22 100644 --- a/src/pacman/ini.h +++ b/src/pacman/ini.h @@ -27,4 +27,4 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data); #endif /* _PM_CONF_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/package.c b/src/pacman/package.c index 52219ff..0689783 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -448,4 +448,4 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/package.h b/src/pacman/package.h index 65eea87..bc31892 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -33,4 +33,4 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status); #endif /* _PM_PACKAGE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index df73bcf..97aeff9 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1223,4 +1223,4 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 7c9c365..094334b 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -40,4 +40,4 @@ int pacman_upgrade(alpm_list_t *targets); #endif /* _PM_PACMAN_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/query.c b/src/pacman/query.c index e62272a..cc9ea41 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -506,4 +506,4 @@ int pacman_query(alpm_list_t *targets) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 8cf3ebc..b155c19 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -182,4 +182,4 @@ cleanup: return retval; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e9b98fa..357cf26 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -957,4 +957,4 @@ int pacman_sync(alpm_list_t *targets) return sync_trans(targets); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5495ea9..5aacb48 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -119,4 +119,4 @@ int pacman_upgrade(alpm_list_t *targets) return sync_prepare_execute(); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 05135d7..8c2d0c0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1665,4 +1665,4 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f8..b586994 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -82,4 +82,4 @@ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_li #endif /* _PM_UTIL_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index d539fa2..a007588 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -35,4 +35,4 @@ 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 ts=2 sw=2 noet: +# vim:set noet: diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index b13d770..0058f8c 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -134,4 +134,4 @@ int main(int argc, char *argv[]) cleanup(0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 687e558..a7426b1 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -458,4 +458,4 @@ int main(int argc, char *argv[]) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/pactree.c b/src/util/pactree.c index 7813267..0557c77 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -559,4 +559,4 @@ finish: return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/testdb.c b/src/util/testdb.c index 3d341b3..e4cf518 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -293,4 +293,4 @@ int main(int argc, char *argv[]) cleanup(errors > 0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index 55e3c7a..f71333c 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -20,4 +20,4 @@ EXTRA_DIST = \ ldconfig.stub \ $(check_SCRIPTS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index 9ab0c77..dba84e3 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -22,4 +22,4 @@ $(CONFTESTS): Makefile $(AM_V_at)chmod a-w $@.tmp $(AM_V_at)mv $@.tmp $@ -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index d525d89..5dca9a4 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -7,4 +7,4 @@ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ $(check_SCRIPTS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/test/util/Makefile.am b/test/util/Makefile.am index 5839f37..0a9f7ea 100644 --- a/test/util/Makefile.am +++ b/test/util/Makefile.am @@ -7,4 +7,4 @@ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ $(check_SCRIPTS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: -- 1.8.5.3