26 files changed, 38 insertions, 59 deletions
diff --git a/bin/eselect.in b/bin/eselect.in
index 5788178..0bca2c7 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,5 +1,6 @@
 #!@BASH@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -191,5 +192,3 @@ if [[ -n ${action} ]] ; then
 else
 	ec_do_help
 fi
-
-# vim: set ft=eselect :
diff --git a/libs/config.bash.in b/libs/config.bash.in
index 3902ab0..3653abb 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -117,5 +118,3 @@ append_config() {
 		store_config ${configfile} ${key} ${newvalue[@]}
 	fi
 }
-
-# vim: set ft=eselect :
diff --git a/libs/core.bash.in b/libs/core.bash.in
index d5ccfb8..4326627 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -111,5 +112,3 @@ eval() {
 sed() {
 	@SED@ "$@"
 }
-
-# vim: set ft=eselect :
diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index f082837..e6bfb69 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -99,5 +100,3 @@ do_help() {
 	fi
 	true
 }
-
-# vim: set ft=eselect :
diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index 2212035..33ceca1 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
diff --git a/libs/manip.bash.in b/libs/manip.bash.in
index f6cdac0..995e8fb 100644
--- a/libs/manip.bash.in
+++ b/libs/manip.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -25,5 +26,3 @@ svn_date_to_version() {
 	s=${s//-}
 	echo "${s}"
 }
-
-# vim: set ft=eselect :
diff --git a/libs/multilib.bash.in b/libs/multilib.bash.in
index 75d52f3..6cfa859 100644
--- a/libs/multilib.bash.in
+++ b/libs/multilib.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -34,5 +35,3 @@ list_libdirs() {
 	fi
 	echo "${libdirs[@]}"
 }
-
-# vim: set ft=eselect :
diff --git a/libs/output.bash.in b/libs/output.bash.in
index 0a5ac71..c235246 100644
--- a/libs/output.bash.in
+++ b/libs/output.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -236,5 +237,3 @@ space() {
 	done
 	echo -n "${ret}"
 }
-
-# vim: set ft=eselect :
diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index edb4c7c..e6100d5 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -155,5 +156,3 @@ get_news_dir_name() {
 	local name=${1%::*} repo=${1##*::}
 	echo "$(get_repo_news_dir "${repo}")/${name}"
 }
-
-# vim: set ft=eselect :
diff --git a/libs/path-manipulation.bash.in b/libs/path-manipulation.bash.in
index f08290e..a81babc 100644
--- a/libs/path-manipulation.bash.in
+++ b/libs/path-manipulation.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -63,5 +64,3 @@ dirname() {
 canonicalise() {
 	@CANONICALISE@ "$@"
 }
-
-# vim: set ft=eselect :
diff --git a/libs/skel.bash.in b/libs/skel.bash.in
index d8078cc..cdc7452 100644
--- a/libs/skel.bash.in
+++ b/libs/skel.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 1999-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 1999-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -307,5 +308,3 @@ do_add() {
 		die -q "Installing ${2} as ${PREFIX}/etc/env.d/${IFACE}/${1}/${3} failed!"
 	fi
 }
-
-# vim: set ft=eselect :
diff --git a/libs/tests.bash.in b/libs/tests.bash.in
index c0e3ae3..09cdeaa 100644
--- a/libs/tests.bash.in
+++ b/libs/tests.bash.in
@@ -1,4 +1,5 @@
-# Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
+# -*-eselect-*-  vim: ft=eselect
+# Copyright (c) 2005-2009 Gentoo Foundation
 # $Id$
 # This file is part of the 'eselect' tools framework.
 #
@@ -36,5 +37,3 @@ is_function() {
 is_number() {
 	[[ -n ${1} ]] && [[ -z ${1//[[:digit:]]} ]]
 }
-
-# vim: set ft=eselect :
diff --git a/misc/eselect.bashcomp b/misc/eselect.bashcomp
index 444b79a..5c4a988 100644
--- a/misc/eselect.bashcomp
+++ b/misc/eselect.bashcomp
@@ -1,3 +1,4 @@
+# -*- mode: sh; indent-tabs-mode: nil; -*-  vim: set ft=sh tw=80 sw=4 et :
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -43,10 +44,3 @@ _eselect() {
 }
 
 complete -F _eselect eselect
-
-# Local Variables:
-# mode: sh
-# indent-tabs-mode: nil
-# End:
-
-# vim: set ft=sh tw=80 sw=4 et :
diff --git a/modules/bashcomp.eselect b/modules/bashcomp.eselect
index 6808024..9692ce5 100644
--- a/modules/bashcomp.eselect
+++ b/modules/bashcomp.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -225,5 +226,3 @@ do_disable() {
 		fi
 	done
 }
-
-# vim: set ft=eselect :
diff --git a/modules/binutils.eselect b/modules/binutils.eselect
index 43f62f1..6106826 100644
--- a/modules/binutils.eselect
+++ b/modules/binutils.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -257,5 +258,3 @@ do_show() {
 
 	echo "${chost}-${version}"
 }
-
-# vim: set ft=eselect :
diff --git a/modules/config.eselect b/modules/config.eselect
index 9c81df3..8e369b3 100644
--- a/modules/config.eselect
+++ b/modules/config.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -431,5 +432,3 @@ do_interactive() {
 		esac
 	done
 }
-
-# vim: set ft=eselect :
diff --git a/modules/cow.eselect b/modules/cow.eselect
index 51f0815..d8dbf99 100644
--- a/modules/cow.eselect
+++ b/modules/cow.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -72,5 +73,3 @@ do_think() {
 
 	echo "${@:-Am I a cow?}" | cowthink ${params}
 }
-
-# vim: set ft=eselect :
diff --git a/modules/editor.eselect b/modules/editor.eselect
index 446dd2e..f63aa8a 100644
--- a/modules/editor.eselect
+++ b/modules/editor.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/modules/env.eselect b/modules/env.eselect
index 6b28c59..10e89cb 100644
--- a/modules/env.eselect
+++ b/modules/env.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -312,5 +313,3 @@ do_update() {
 		-e "s/^\(.*\)=\"\(.*\)\"/setenv \1 '\2'/" \
 		$(canonicalise ${ENVPROFILE/.env/.csh})
 }
-
-# vim: ft=eselect :
diff --git a/modules/kernel.eselect b/modules/kernel.eselect
index 61447d6..819cd33 100644
--- a/modules/kernel.eselect
+++ b/modules/kernel.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -128,5 +129,3 @@ do_set() {
 		set_symlink "${1}" || die -q "Couldn't set a new symlink"
 	fi
 }
-
-# vim: set ft=eselect :
diff --git a/modules/modules.eselect b/modules/modules.eselect
index d1b3f56..8b825ec 100644
--- a/modules/modules.eselect
+++ b/modules/modules.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -111,5 +112,3 @@ do_has() {
 # 			|| die -q "Failed to install module file"
 # 	fi
 # }
-
-# vim: ts=4 sw=4 noet fdm=marker
diff --git a/modules/news.eselect b/modules/news.eselect
index f115025..8ee319e 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 2005-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/modules/pager.eselect b/modules/pager.eselect
index 788215e..db88f0a 100644
--- a/modules/pager.eselect
+++ b/modules/pager.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/modules/profile.eselect b/modules/profile.eselect
index 51df9fd..a32b0fa 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -151,5 +152,3 @@ do_set() {
 		set_symlink "${1}" ${force} || die -q "Couldn't set a new symlink"
 	fi
 }
-
-# vim: set ft=eselect :
diff --git a/modules/rc.eselect b/modules/rc.eselect
index 2ce7d51..1316ebf 100644
--- a/modules/rc.eselect
+++ b/modules/rc.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -399,5 +400,3 @@ do_restart() {
 	write_list_start "Restarting init script$([[ $# -gt 1 ]] && echo -n 's')"
 	run_runscript restart "$@"
 }
-
-# vim: set ft=eselect :
diff --git a/modules/visual.eselect b/modules/visual.eselect
index 8743da0..e184439 100644
--- a/modules/visual.eselect
+++ b/modules/visual.eselect
@@ -1,3 +1,4 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$