Remove ts and sw from vim modeline when noet is set

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 <bluewind@xinu.at>
Signed-off-by: Allan McRae <allan@archlinux.org>

51 files changed, 51 insertions, 51 deletions

diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index e60d570c..f66daedf 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -77,4 +77,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 91b40a16..f38afef8 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 5999d08b..711e0e83 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 f2e97cee..4a69bf84 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 126f50a5..d67d66a0 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 cc895684..e881196d 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 9995e882..65b26bec 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 e098c10b..c2989b6d 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 c1585612..3d9d4e53 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 6029e120..d6a7b3c0 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 b672bbed..2fbb1dbb 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 67b7368d..17a8a69f 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 5a6e2be8..369530b7 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 f7a667df..8cf36ecb 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 60423343..b9cbed76 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -708,4 +708,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 9bfa24f4..3025be9a 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -109,4 +109,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 6e1ff0a7..baa02b75 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 417b12d9..c57e6c50 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 4eb779f7..777f1b90 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -914,4 +914,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 546521f8..8a8ff46e 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 5b80ef1f..d07b188d 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -494,4 +494,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 4a9314d1..c9fab9b4 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 bc59cd14..53867f5b 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -750,4 +750,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 113414c5..10c586e9 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 b3ebc721..fb6b8564 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 7de190db..2d2426c5 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 4f965503..f948cfb5 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 837774e1..725b7045 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 f4045f5a..401260b2 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 af71c322..aa51a63c 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 6facaa8f..fb28457c 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 44457e6f..1f41f043 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 fcfd4fad..e11d82a1 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -118,4 +118,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 584d80e6..7c126416 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 c4a9d84c..d232bcc3 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -92,4 +92,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 c767bfbd..41f98b20 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 76e94a9c..e8863f68 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -774,4 +774,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 a972d127..357c20ef 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -152,4 +152,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 a58fff94..2f682784 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 86f4280c..f3f81f5a 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 d78c5f1f..0afca24e 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -758,4 +758,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 8c6bd410..123720ab 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 7c887860..caacd24e 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 239bfef1..b414b1f1 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 17a3e8e6..f1add246 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1316,4 +1316,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 1aeba7d4..f25e450b 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 ada8100d..e5328c53 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -405,4 +405,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 7daa78f5..d2bbcf80 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 f28404d7..150b85ea 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 c0997c6f..250c5300 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 bc6d4411..00481677 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: */