From cd2370754ae6893e6df4e835eeb819f827eaee4a Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 23 Jan 2014 00:06:11 +0100
Subject: 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>
---
 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 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 49503333..ba402b2d 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 5a162127..c5097ddf 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 6853f18e..e28c60d9 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 f7272c65..5f103081 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 4b0f881a..1b5d8f66 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -784,4 +784,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 61a7e4c4..882210f4 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 f4649253..a7c66baa 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 3dfd9471..c2940dd3 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 5450f3b3..4b7ec051 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, &section);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 9faf5de7..e8cac509 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 eebcb504..e858e0c8 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 5449df66..511c398d 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 554935b8..2a3ef0ed 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, &section_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 fc881a25..23786a09 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 8ccdc1b6..e4d3e3ab 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 6f0e0822..a6f02b97 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 748bc546..71443394 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -1217,4 +1217,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 fb5856a1..7b33a74e 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 d832d98b..477e4fed 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 aefe4548..56b93334 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 5ed43ed1..f6ee57a8 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 0bf8d228..5416f618 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 f6ccaf89..cbe371d6 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 747a67ec..94a6dc8b 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 d539fa26..a0075887 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 b57b2038..4a67fc38 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 443e822e..948b03d3 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 bd6e9dd9..4192999d 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 53cdb3c1..e3b331ab 100644
--- a/src/util/testdb.c
+++ b/src/util/testdb.c
@@ -294,4 +294,4 @@ int main(int argc, char *argv[])
 	cleanup(errors > 0);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
-- 
cgit v1.2.3-54-g00ecf