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>
This commit is contained in:
Florian Pritz 2014-01-23 00:06:11 +01:00 committed by Allan McRae
parent 83e14aeebd
commit cd2370754a
106 changed files with 107 additions and 107 deletions

View File

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

View File

@ -60,4 +60,4 @@ update-po:
.PHONY: update-po
# vim:set ts=2 sw=2 noet:
# vim:set noet:

View File

@ -554,4 +554,4 @@ ${PACKAGE_NAME}:
use git version : ${wantgitver}
"
# vim:set ts=2 sw=2 noet:
# vim:set noet:

View File

@ -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:

View File

@ -355,4 +355,4 @@ msg "Done."
exit 0
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -48,4 +48,4 @@ pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null
exit 0
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -317,4 +317,4 @@ fi
summarize "$pkgcount" "${candidates[@]}"
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -191,4 +191,4 @@ done 3< <(cmd)
exit 0
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -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:

View File

@ -96,4 +96,4 @@ END {
}
}' | sort
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -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:

View File

@ -231,4 +231,4 @@ for line in "${linearray[@]}"; do
done
finaloutput
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -94,4 +94,4 @@ fi
' > "$buildfile"
} < "$buildfile"
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -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:

View File

@ -26,4 +26,4 @@ SED_PROCESS = \
%.conf: %.conf.in Makefile
$(SED_PROCESS)
# vim:set ts=2 sw=2 noet:
# vim:set noet:

View File

@ -77,4 +77,4 @@ libalpm_la_LIBADD = \
$(LIBCURL_LIBS) \
$(LIBSSL_LIBS)
# vim:set ts=2 sw=2 noet:
# vim:set noet:

View File

@ -731,4 +731,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle)
return ret;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -155,4 +155,4 @@ enum alpm_caps SYMEXPORT alpm_capabilities(void)
| 0;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -1359,4 +1359,4 @@ enum alpm_caps alpm_capabilities(void);
#endif
#endif /* _ALPM_H */
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -494,4 +494,4 @@ finish:
return 0;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -163,4 +163,4 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err)
}
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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: */

View File

@ -36,4 +36,4 @@ void _alpm_graph_free(void *data)
free(graph);
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -37,4 +37,4 @@ void _alpm_graph_free(void *data);
#endif /* _ALPM_GRAPH_H */
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -50,4 +50,4 @@ void _alpm_group_free(alpm_group_t *grp)
FREE(grp);
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -154,4 +154,4 @@ char *strsep(char **, const char *);
#endif /* _ALPM_UTIL_H */
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -161,4 +161,4 @@ uninstall-hook:
cd $(DESTDIR)$(bindir) && \
$(RM) repo-remove repo-elephant
# vim:set ts=2 sw=2 noet:
# vim:set noet:

View File

@ -3063,4 +3063,4 @@ install_package
exit 0 #E_OK
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -127,4 +127,4 @@ fi
# remove the lock file
rm -f "$lockfile"
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -627,4 +627,4 @@ fi
exit 0
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -186,4 +186,4 @@ echo
exit 0
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -223,4 +223,4 @@ fi
create_xdelta "$@"
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -739,4 +739,4 @@ else
fi
exit 0
# vim: set ts=2 sw=2 noet:
# vim: set noet:

View File

@ -1,4 +1,4 @@
EXTRA_DIST = \
util-common.h util-common.c
# vim:set ts=2 sw=2 noet:
# vim:set noet:

View File

@ -107,4 +107,4 @@ char *strndup(const char *s, size_t n)
}
#endif
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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:

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -85,4 +85,4 @@ int pacman_database(alpm_list_t *targets)
return retval;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -54,4 +54,4 @@ int pacman_deptest(alpm_list_t *targets)
return 127;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -1217,4 +1217,4 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -506,4 +506,4 @@ int pacman_query(alpm_list_t *targets)
return ret;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -182,4 +182,4 @@ cleanup:
return retval;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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: */

View File

@ -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:

View File

@ -134,4 +134,4 @@ int main(int argc, char *argv[])
cleanup(0);
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

View File

@ -458,4 +458,4 @@ int main(int argc, char *argv[])
return 0;
}
/* vim: set ts=2 sw=2 noet: */
/* vim: set noet: */

Some files were not shown because too many files have changed in this diff Show More