Move Emacs indentation settings from every file to .dir-locals.el.

334 files changed, 374 insertions, 2320 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00000000..bcb2a2ad
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,5 @@
+;; bash-completion shell-script mode settings for Emacs
+
+((nil     . ((indent-tabs-mode  . nil)))
+ (sh-mode . ((sh-basic-offset   . 4)
+             (sh-indent-comment . t))))
diff --git a/Makefile.am b/Makefile.am
index 5aefd5ce..3441b630 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,8 @@ bash_completion.sh: bash_completion.sh.in Makefile
 
 CLEANFILES = bash_completion.sh bash-completion.pc
 
-EXTRA_DIST = CHANGES $(sysconf_DATA) $(pkgdata_DATA) bash_completion.sh.in
+EXTRA_DIST = CHANGES $(sysconf_DATA) $(pkgdata_DATA) bash_completion.sh.in \
+        .dir-locals.el
 
 install-data-hook:
 	tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \
diff --git a/bash_completion b/bash_completion
index 6bc2afe2..2e0bd8ed 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,3 +1,4 @@
+#                                                          -*- shell-script -*-
 #
 #   bash_completion - programmable completion functions for bash 4.1+
 #
@@ -1888,10 +1889,4 @@ unset have
 set $BASH_COMPLETION_ORIGINAL_V_VALUE
 unset BASH_COMPLETION_ORIGINAL_V_VALUE
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/_mock b/completions/_mock
index 583933d2..cb7d6571 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -1,8 +1,8 @@
+# bash completion for mock                                 -*- shell-script -*-
+
 # Use of this file is deprecated.  Upstream completion is available in
 # mock > 1.1.0, use that instead.
 
-# bash completion for mock
-
 _mock()
 {
     local cur prev words cword split
@@ -66,10 +66,4 @@ _mock()
 } &&
 complete -F _mock mock
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/_modules b/completions/_modules
index 61523915..6f337a90 100644
--- a/completions/_modules
+++ b/completions/_modules
@@ -1,8 +1,8 @@
+# module completion by Ted Stern <stern@cray.com>          -*- shell-script -*-
+#
 # Use of this file is deprecated, upstream completion is available in
 # modules >= 3.2.7, use that instead.
 #
-# module completion by Ted Stern <stern@cray.com>
-#
 # Completion for Environment Modules `module' alias.
 #
 # See http://sourceforge.net/projects/modules/
@@ -81,10 +81,4 @@ _module ()
 } &&
 complete -F _module -o default module
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/_subversion b/completions/_subversion
index f17a7116..103bcb86 100644
--- a/completions/_subversion
+++ b/completions/_subversion
@@ -1,8 +1,8 @@
+# svn completion                                           -*- shell-script -*-
+
 # Use of this file is deprecated.  Upstream completion is available in
 # subversion >= 0.12.0, use that instead.
 
-# svn completion
-
 _svn()
 {
     local cur prev words cword
@@ -341,10 +341,4 @@ _svnlook()
 } &&
 complete -F _svnlook -o default svnlook
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/_yum b/completions/_yum
index 87f4b8b5..c2d37948 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -1,8 +1,8 @@
+# yum(8) completion                                        -*- shell-script -*-
+
 # Use of this file is deprecated.  Upstream completion is available in
 # yum > 3.2.25, use that instead.
 
-# yum(8) completion
-
 _yum_list()
 {
     if [[ "$1" == all ]] ; then
@@ -141,10 +141,4 @@ _yum()
 } &&
 complete -F _yum yum
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/_yum-utils b/completions/_yum-utils
index 2917e9ad..22b97af8 100644
--- a/completions/_yum-utils
+++ b/completions/_yum-utils
@@ -1,8 +1,8 @@
+# bash completion for repomanage                           -*- shell-script -*-
+
 # Use of this file is deprecated.  Upstream completion is available in
 # yum-utils >= 1.1.24, use that instead.
 
-# bash completion for repomanage
-
 _repomanage()
 {
     local cur prev words cword split
@@ -21,10 +21,4 @@ _repomanage()
 } &&
 complete -F _repomanage repomanage
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/abook b/completions/abook
index a26f92df..07a0f090 100644
--- a/completions/abook
+++ b/completions/abook
@@ -1,4 +1,4 @@
-# abook(1) completion
+# abook(1) completion                                      -*- shell-script -*-
 
 _abook()
 {
@@ -49,10 +49,4 @@ _abook()
 } &&
 complete -F _abook abook
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/aclocal b/completions/aclocal
index 6c61870b..2bbc3152 100644
--- a/completions/aclocal
+++ b/completions/aclocal
@@ -1,4 +1,4 @@
-# aclocal(1) completion
+# aclocal(1) completion                                    -*- shell-script -*-
 
 _aclocal()
 {
@@ -32,10 +32,4 @@ _aclocal()
 } &&
 complete -F _aclocal aclocal aclocal-1.11
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/add_members b/completions/add_members
index 27feb5e0..3a6661c2 100644
--- a/completions/add_members
+++ b/completions/add_members
@@ -1,4 +1,4 @@
-# mailman add_members completion
+# mailman add_members completion                           -*- shell-script -*-
 
 _add_members()
 {
@@ -29,10 +29,4 @@ _add_members()
 } &&
 complete -F _add_members add_members
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/alias b/completions/alias
index 65b37251..112dea3b 100644
--- a/completions/alias
+++ b/completions/alias
@@ -1,4 +1,4 @@
-# bash alias completion
+# bash alias completion                                    -*- shell-script -*-
 
 _alias()
 {
@@ -17,10 +17,4 @@ _alias()
 } &&
 complete -F _alias -o nospace alias
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ant b/completions/ant
index e174c17b..96ef8172 100644
--- a/completions/ant
+++ b/completions/ant
@@ -1,4 +1,4 @@
-# bash completion for ant and phing
+# bash completion for ant and phing                        -*- shell-script -*-
 
 _ant()
 {
@@ -61,10 +61,4 @@ complete -F _ant ant phing
 type complete-ant-cmd.pl &>/dev/null && \
     complete -C complete-ant-cmd.pl -F _ant ant || :
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/apache2ctl b/completions/apache2ctl
index d9b10639..f6fdeb30 100644
--- a/completions/apache2ctl
+++ b/completions/apache2ctl
@@ -1,4 +1,4 @@
-# apache2ctl(1) completion
+# apache2ctl(1) completion                                 -*- shell-script -*-
 
 _apache2ctl()
 {
@@ -13,10 +13,4 @@ _apache2ctl()
 } &&
 complete -F _apache2ctl apache2ctl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/apt-build b/completions/apt-build
index dcf4325f..aa78b230 100644
--- a/completions/apt-build
+++ b/completions/apt-build
@@ -1,4 +1,4 @@
-# Debian apt-build(1) completion.
+# Debian apt-build(1) completion                           -*- shell-script -*-
 
 _apt_build()
 {
@@ -56,10 +56,4 @@ _apt_build()
 } &&
 complete -F _apt_build apt-build
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/apt-cache b/completions/apt-cache
index a50f89c0..00b41478 100644
--- a/completions/apt-cache
+++ b/completions/apt-cache
@@ -1,4 +1,4 @@
-# Debian apt-cache(8) completion.
+# Debian apt-cache(8) completion                           -*- shell-script -*-
 
 _apt_cache()
 {
@@ -71,10 +71,4 @@ _apt_cache()
 } &&
 complete -F _apt_cache apt-cache
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/apt-get b/completions/apt-get
index bbc43306..447305a4 100644
--- a/completions/apt-get
+++ b/completions/apt-get
@@ -1,4 +1,4 @@
-# Debian apt-get(8) completion.
+# Debian apt-get(8) completion                             -*- shell-script -*-
 
 _apt_get()
 {
@@ -73,10 +73,4 @@ _apt_get()
 } &&
 complete -F _apt_get apt-get
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/aptitude b/completions/aptitude
index cf18c66b..1afd738d 100644
--- a/completions/aptitude
+++ b/completions/aptitude
@@ -1,4 +1,4 @@
-# Debian aptitude(1) completion
+# Debian aptitude(1) completion                            -*- shell-script -*-
 
 _have grep-status && {
 _comp_dpkg_hold_packages()
@@ -88,10 +88,4 @@ _aptitude()
 } &&
 complete -F _aptitude -o default aptitude
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/arch b/completions/arch
index 80f1fc3b..3bb5f571 100644
--- a/completions/arch
+++ b/completions/arch
@@ -1,4 +1,4 @@
-# mailman arch completion
+# mailman arch completion                                  -*- shell-script -*-
 
 # Try to detect whether this is the mailman "arch" to avoid installing
 # it for the coreutils/util-linux-ng one.
@@ -44,10 +44,4 @@ _arch()
 } &&
 complete -F _arch arch
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/arping b/completions/arping
index ea35bbde..231a63be 100644
--- a/completions/arping
+++ b/completions/arping
@@ -1,4 +1,4 @@
-# arping(8) completion
+# arping(8) completion                                     -*- shell-script -*-
 
 _arping()
 {
@@ -28,10 +28,4 @@ _arping()
 } &&
 complete -F _arping arping
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/arpspoof b/completions/arpspoof
index 91bafe58..9c1b99f5 100644
--- a/completions/arpspoof
+++ b/completions/arpspoof
@@ -1,4 +1,4 @@
-# arpspoof completion
+# arpspoof completion                                      -*- shell-script -*-
 
 _arpspoof()
 {
@@ -25,10 +25,4 @@ _arpspoof()
 } &&
 complete -F _arpspoof arpspoof
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/asciidoc b/completions/asciidoc
index 36b463c4..9f4a94e0 100644
--- a/completions/asciidoc
+++ b/completions/asciidoc
@@ -1,3 +1,5 @@
+# asciidoc(1) completion                                   -*- shell-script -*-
+
 _asciidoc_doctype()
 {
     COMPREPLY+=( $( compgen -W 'article book manpage' -- "$cur" ) )
@@ -85,10 +87,4 @@ _a2x()
 } &&
 complete -F _a2x a2x
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/aspell b/completions/aspell
index 7d940c68..a663fa95 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -1,4 +1,4 @@
-# bash completion for aspell
+# bash completion for aspell                               -*- shell-script -*-
 
 _aspell_dictionary()
 {
@@ -87,10 +87,4 @@ _aspell()
 } &&
 complete -F _aspell aspell
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/autoconf b/completions/autoconf
index 0484860e..fea524e7 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -1,4 +1,4 @@
-# autoconf(1) completion
+# autoconf(1) completion                                   -*- shell-script -*-
 
 _autoconf()
 {
@@ -37,10 +37,4 @@ _autoconf()
 } &&
 complete -F _autoconf autoconf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/automake b/completions/automake
index 64057bc6..78bc6db2 100644
--- a/completions/automake
+++ b/completions/automake
@@ -1,4 +1,4 @@
-# automake(1) completion
+# automake(1) completion                                   -*- shell-script -*-
 
 _automake()
 {
@@ -33,10 +33,4 @@ _automake()
 } &&
 complete -F _automake automake automake-1.11
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/autoreconf b/completions/autoreconf
index b661f985..8de40c88 100644
--- a/completions/autoreconf
+++ b/completions/autoreconf
@@ -1,4 +1,4 @@
-# autoreconf(1) completion
+# autoreconf(1) completion                                 -*- shell-script -*-
 
 _autoreconf()
 {
@@ -38,10 +38,4 @@ _autoreconf()
 } &&
 complete -F _autoreconf autoreconf autoheader
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/autorpm b/completions/autorpm
index 51c12fa2..377ac987 100644
--- a/completions/autorpm
+++ b/completions/autorpm
@@ -1,4 +1,4 @@
-# autorpm(8) completion
+# autorpm(8) completion                                    -*- shell-script -*-
 
 _autorpm()
 {
@@ -11,10 +11,4 @@ _autorpm()
 } &&
 complete -F _autorpm autorpm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/autoscan b/completions/autoscan
index e5040abd..80b051cf 100644
--- a/completions/autoscan
+++ b/completions/autoscan
@@ -1,4 +1,4 @@
-# autoscan(1) completion
+# autoscan(1) completion                                   -*- shell-script -*-
 
 _autoscan()
 {
@@ -31,10 +31,4 @@ _autoscan()
 } &&
 complete -F _autoscan autoscan autoupdate
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/avctrl b/completions/avctrl
index 57f5d57b..eb321a07 100644
--- a/completions/avctrl
+++ b/completions/avctrl
@@ -1,4 +1,4 @@
-# avctrl completion
+# avctrl completion                                        -*- shell-script -*-
 
 _avctrl()
 {
@@ -17,10 +17,4 @@ _avctrl()
 } &&
 complete -F _avctrl avctrl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/badblocks b/completions/badblocks
index 4953a182..2dc8eb43 100644
--- a/completions/badblocks
+++ b/completions/badblocks
@@ -1,4 +1,4 @@
-# badblocks(8) completion
+# badblocks(8) completion                                  -*- shell-script -*-
 
 _badblocks()
 {
@@ -29,10 +29,4 @@ _badblocks()
 } &&
 complete -F _badblocks badblocks
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/bk b/completions/bk
index 580ec040..8be6fb76 100644
--- a/completions/bk
+++ b/completions/bk
@@ -1,4 +1,5 @@
-# BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
+# BitKeeper completion                                     -*- shell-script -*-
+# adapted from code by  Bart Trojanowski <bart@jukie.net>
 
 _bk()
 {
@@ -15,10 +16,4 @@ _bk()
 } &&
 complete -F _bk bk
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/brctl b/completions/brctl
index ced11cef..441aa08f 100644
--- a/completions/brctl
+++ b/completions/brctl
@@ -1,4 +1,4 @@
-# bash completion for brctl
+# bash completion for brctl                                -*- shell-script -*-
 
 _brctl()
 {
@@ -37,10 +37,4 @@ _brctl()
 } &&
 complete -F _brctl -o default brctl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/btdownloadheadless.py b/completions/btdownloadheadless.py
index ea0f781a..60d1962d 100644
--- a/completions/btdownloadheadless.py
+++ b/completions/btdownloadheadless.py
@@ -1,4 +1,4 @@
-# btdownloadheadless(1) completion
+# btdownloadheadless(1) completion                         -*- shell-script -*-
 
 _btdownload()
 {
@@ -29,10 +29,4 @@ _btdownload()
 complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
     btdownloadgui.py
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/bzip2 b/completions/bzip2
index f7d615ea..6e6c68bb 100644
--- a/completions/bzip2
+++ b/completions/bzip2
@@ -1,4 +1,4 @@
-# bash completion for bzip2
+# bash completion for bzip2                                -*- shell-script -*-
 
 _bzip2()
 {
@@ -38,10 +38,4 @@ _bzip2()
 } &&
 complete -F _bzip2 bzip2 pbzip2 lbzip2
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cal b/completions/cal
index f6fafb59..880b0b35 100644
--- a/completions/cal
+++ b/completions/cal
@@ -1,3 +1,5 @@
+# cal(1) completion                                        -*- shell-script -*-
+
 _cal()
 {
     local cur prev words cword
@@ -29,10 +31,4 @@ _cal()
 } &&
 complete -F _cal cal ncal
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cancel b/completions/cancel
index 5268e08f..3e9a3781 100644
--- a/completions/cancel
+++ b/completions/cancel
@@ -1,4 +1,4 @@
-# cancel(1) completion
+# cancel(1) completion                                     -*- shell-script -*-
 
 _cancel()
 {
@@ -9,10 +9,4 @@ _cancel()
 } &&
 complete -F _cancel cancel
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cardctl b/completions/cardctl
index 6ed4558d..0532d6ef 100644
--- a/completions/cardctl
+++ b/completions/cardctl
@@ -1,4 +1,4 @@
-# Linux cardctl(8) completion
+# Linux cardctl(8) completion                              -*- shell-script -*-
 
 _cardctl()
 {
@@ -12,10 +12,4 @@ _cardctl()
 } &&
 complete -F _cardctl cardctl pccardctl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cfagent b/completions/cfagent
index 01ca7ad5..f3e227a4 100644
--- a/completions/cfagent
+++ b/completions/cfagent
@@ -1,4 +1,4 @@
-# cfagent completion
+# cfagent completion                                       -*- shell-script -*-
 
 _cfagent()
 {
@@ -18,10 +18,4 @@ _cfagent()
 } &&
 complete -F _cfagent cfagent
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cfrun b/completions/cfrun
index 810f03dc..288bcf43 100644
--- a/completions/cfrun
+++ b/completions/cfrun
@@ -1,4 +1,4 @@
-# cfrun completion
+# cfrun completion                                         -*- shell-script -*-
 
 _cfrun()
 {
@@ -44,10 +44,4 @@ _cfrun()
 } &&
 complete -F _cfrun cfrun
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chage b/completions/chage
index 3bd1816e..1842bb8a 100644
--- a/completions/chage
+++ b/completions/chage
@@ -1,4 +1,4 @@
-# chage(1) completion
+# chage(1) completion                                      -*- shell-script -*-
 
 _chage()
 {
@@ -23,10 +23,4 @@ _chage()
 } &&
 complete -F _chage chage
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/change_pw b/completions/change_pw
index aa4507d8..98852583 100644
--- a/completions/change_pw
+++ b/completions/change_pw
@@ -1,4 +1,4 @@
-# mailman change_pw completion
+# mailman change_pw completion                             -*- shell-script -*-
 
 _change_pw()
 {
@@ -22,10 +22,4 @@ _change_pw()
 } &&
 complete -F _change_pw change_pw
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/check_db b/completions/check_db
index 5a6cd063..651b375c 100644
--- a/completions/check_db
+++ b/completions/check_db
@@ -1,4 +1,4 @@
-# mailman check_db completion
+# mailman check_db completion                              -*- shell-script -*-
 
 _check_db()
 {
@@ -14,10 +14,4 @@ _check_db()
 } &&
 complete -F _check_db check_db
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/check_perms b/completions/check_perms
index 695aad5c..472b9266 100644
--- a/completions/check_perms
+++ b/completions/check_perms
@@ -1,4 +1,4 @@
-# mailman check_perms completion
+# mailman check_perms completion                           -*- shell-script -*-
 
 _check_perms()
 {
@@ -12,10 +12,4 @@ _check_perms()
 } &&
 complete -F _check_perms check_perms
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chgrp b/completions/chgrp
index cdd6c2ce..7355a680 100644
--- a/completions/chgrp
+++ b/completions/chgrp
@@ -1,4 +1,4 @@
-# chgrp(1) completion
+# chgrp(1) completion                                      -*- shell-script -*-
 
 _chgrp()
 {
@@ -37,10 +37,4 @@ _chgrp()
 } &&
 complete -F _chgrp chgrp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chkconfig b/completions/chkconfig
index 1a640ff1..31a575e3 100644
--- a/completions/chkconfig
+++ b/completions/chkconfig
@@ -1,4 +1,4 @@
-# chkconfig(8) completion
+# chkconfig(8) completion                                  -*- shell-script -*-
 
 _chkconfig()
 {
@@ -30,10 +30,4 @@ _chkconfig()
 } &&
 complete -F _chkconfig chkconfig
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chown b/completions/chown
index 1ce0edc0..f9bd9686 100644
--- a/completions/chown
+++ b/completions/chown
@@ -1,4 +1,4 @@
-# chown(1) completion
+# chown(1) completion                                      -*- shell-script -*-
 
 _chown()
 {
@@ -43,10 +43,4 @@ _chown()
 } &&
 complete -F _chown chown
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chpasswd b/completions/chpasswd
index ed77069b..d8a7e62c 100644
--- a/completions/chpasswd
+++ b/completions/chpasswd
@@ -1,4 +1,4 @@
-# chpasswd(8) completion
+# chpasswd(8) completion                                   -*- shell-script -*-
 
 _chpasswd()
 {
@@ -26,10 +26,4 @@ _chpasswd()
 } &&
 complete -F _chpasswd chpasswd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chrpath b/completions/chrpath
index 89889c3b..29a71851 100644
--- a/completions/chrpath
+++ b/completions/chrpath
@@ -1,3 +1,5 @@
+# chrpath(1) completion                                    -*- shell-script -*-
+
 _chrpath()
 {
     local cur prev words cword
@@ -22,10 +24,4 @@ _chrpath()
 } &&
 complete -F _chrpath chrpath
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/chsh b/completions/chsh
index fd25d672..f65291a1 100644
--- a/completions/chsh
+++ b/completions/chsh
@@ -1,4 +1,4 @@
-# chsh(1) completion
+# chsh(1) completion                                       -*- shell-script -*-
 
 _chsh()
 {
@@ -25,10 +25,4 @@ _chsh()
 } &&
 complete -F _chsh chsh
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cksfv b/completions/cksfv
index 87f3253d..d21bcf39 100644
--- a/completions/cksfv
+++ b/completions/cksfv
@@ -1,4 +1,4 @@
-# cksfv completion by Chris <xris@forevermore.net>
+# cksfv completion by Chris <xris@forevermore.net>         -*- shell-script -*-
 
 _cksfv()
 {
@@ -26,10 +26,4 @@ _cksfv()
 } &&
 complete -F _cksfv cksfv
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cleanarch b/completions/cleanarch
index 24d405d7..df18aaf5 100644
--- a/completions/cleanarch
+++ b/completions/cleanarch
@@ -1,4 +1,4 @@
-# mailman cleanarch completion
+# mailman cleanarch completion                             -*- shell-script -*-
 
 _cleanarch()
 {
@@ -13,10 +13,4 @@ _cleanarch()
 } &&
 complete -F _cleanarch cleanarch
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/clisp b/completions/clisp
index b2ea0c18..fd19b252 100644
--- a/completions/clisp
+++ b/completions/clisp
@@ -1,3 +1,4 @@
+#                                                          -*- shell-script -*-
 # bash brogrammable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -19,10 +20,4 @@ _clisp()
 } &&
 complete -F _clisp -o default clisp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/clone_member b/completions/clone_member
index 11067e7c..74608f96 100644
--- a/completions/clone_member
+++ b/completions/clone_member
@@ -1,4 +1,4 @@
-# mailman clone_member completion
+# mailman clone_member completion                          -*- shell-script -*-
 
 _clone_member()
 {
@@ -22,10 +22,4 @@ _clone_member()
 } &&
 complete -F _clone_member clone_member
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/complete b/completions/complete
index e5b69a05..ebf90237 100644
--- a/completions/complete
+++ b/completions/complete
@@ -1,4 +1,4 @@
-# bash complete completion
+# bash complete completion                                 -*- shell-script -*-
 
 _complete()
 {
@@ -47,10 +47,4 @@ _complete()
 } &&
 complete -F _complete compgen complete
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/config_list b/completions/config_list
index a695b038..50fa0500 100644
--- a/completions/config_list
+++ b/completions/config_list
@@ -1,4 +1,4 @@
-# mailman config_list completion
+# mailman config_list completion                           -*- shell-script -*-
 
 _config_list()
 {
@@ -24,10 +24,4 @@ _config_list()
 } &&
 complete -F _config_list config_list
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/configure b/completions/configure
index 2127571b..8e28d451 100644
--- a/completions/configure
+++ b/completions/configure
@@ -1,4 +1,4 @@
-# bash completion for configure
+# bash completion for configure                            -*- shell-script -*-
 
 _configure()
 {
@@ -39,10 +39,4 @@ _configure()
 } &&
 complete -F _configure configure
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/convert b/completions/convert
index 31792c3e..c86293a6 100644
--- a/completions/convert
+++ b/completions/convert
@@ -1,4 +1,4 @@
-# bash completion for ImageMagick
+# bash completion for ImageMagick                          -*- shell-script -*-
 
 _ImageMagick()
 {
@@ -325,10 +325,4 @@ _stream()
 } &&
 complete -F _stream stream
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cowsay b/completions/cowsay
index 86df189b..47c2e52c 100644
--- a/completions/cowsay
+++ b/completions/cowsay
@@ -1,4 +1,4 @@
-# bash completion for cowsay
+# bash completion for cowsay                               -*- shell-script -*-
 
 _cowsay()
 {
@@ -19,10 +19,4 @@ _cowsay()
 } &&
 complete -F _cowsay -o default cowsay cowthink
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cpan2dist b/completions/cpan2dist
index 84ec3b60..f6a67ac6 100644
--- a/completions/cpan2dist
+++ b/completions/cpan2dist
@@ -1,4 +1,4 @@
-# bash completion for cpan2dist
+# bash completion for cpan2dist                            -*- shell-script -*-
 
 _cpan2dist()
 {
@@ -34,10 +34,4 @@ _cpan2dist()
 } &&
 complete -F _cpan2dist -o default cpan2dist
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cpio b/completions/cpio
index ce299149..ebbe5c57 100644
--- a/completions/cpio
+++ b/completions/cpio
@@ -1,4 +1,4 @@
-# bash completion for cpio
+# bash completion for cpio                                 -*- shell-script -*-
 
 _cpio_format()
 {
@@ -88,10 +88,4 @@ _cpio()
 } &&
 complete -F _cpio cpio
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cppcheck b/completions/cppcheck
index 5174833e..5dd30931 100644
--- a/completions/cppcheck
+++ b/completions/cppcheck
@@ -1,4 +1,4 @@
-# bash completion for cppcheck(1)
+# bash completion for cppcheck(1)                          -*- shell-script -*-
 
 _cppcheck()
 {
@@ -57,10 +57,4 @@ _cppcheck()
 } &&
 complete -F _cppcheck cppcheck
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/crontab b/completions/crontab
index ca233769..ddd0066c 100644
--- a/completions/crontab
+++ b/completions/crontab
@@ -1,4 +1,4 @@
-# crontab(1) completion
+# crontab(1) completion                                    -*- shell-script -*-
 
 _crontab()
 {
@@ -45,10 +45,4 @@ _crontab()
 } &&
 complete -F _crontab crontab
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cryptsetup b/completions/cryptsetup
index 566c4f73..2bbdc952 100644
--- a/completions/cryptsetup
+++ b/completions/cryptsetup
@@ -1,4 +1,4 @@
-# bash completion for cryptsetup
+# bash completion for cryptsetup                           -*- shell-script -*-
 
 _cryptsetup_name()
 {
@@ -103,10 +103,4 @@ _cryptsetup()
 } &&
 complete -F _cryptsetup cryptsetup
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/curl b/completions/curl
index a0060415..f0fc6acf 100644
--- a/completions/curl
+++ b/completions/curl
@@ -1,3 +1,5 @@
+# curl(1) completion                                       -*- shell-script -*-
+
 _curl()
 {
     local cur prev words cword
@@ -80,10 +82,4 @@ _curl()
 } &&
 complete -F _curl curl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cvs b/completions/cvs
index 7baeb976..bafe1901 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -1,4 +1,4 @@
-# cvs(1) completion
+# cvs(1) completion                                        -*- shell-script -*-
 
 _cvs_entries()
 {
@@ -387,10 +387,4 @@ _cvs()
 } &&
 complete -F _cvs cvs
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/cvsps b/completions/cvsps
index 1821a1a1..8b986f57 100644
--- a/completions/cvsps
+++ b/completions/cvsps
@@ -1,4 +1,4 @@
-# bash completion for cvsps
+# bash completion for cvsps                                -*- shell-script -*-
 
 _cvsps()
 {
@@ -55,10 +55,4 @@ _cvsps()
 } &&
 complete -F _cvsps cvsps
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dd b/completions/dd
index 1c4452eb..53132dcc 100644
--- a/completions/dd
+++ b/completions/dd
@@ -1,4 +1,4 @@
-# bash completion for dd
+# bash completion for dd                                   -*- shell-script -*-
 
 _dd()
 {
@@ -27,10 +27,4 @@ _dd()
 } &&
 complete -F _dd -o nospace dd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dhclient b/completions/dhclient
index 2922296b..10bbbe66 100644
--- a/completions/dhclient
+++ b/completions/dhclient
@@ -1,4 +1,4 @@
-# bash completion for dhclient
+# bash completion for dhclient                             -*- shell-script -*-
 
 _dhclient()
 {
@@ -25,10 +25,4 @@ _dhclient()
 } &&
 complete -F _dhclient dhclient
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dict b/completions/dict
index 394c1db5..a31816d3 100644
--- a/completions/dict
+++ b/completions/dict
@@ -1,4 +1,4 @@
-# dict(1) completion
+# dict(1) completion                                       -*- shell-script -*-
 
 _dictdata()
 {
@@ -59,10 +59,4 @@ _dict()
 } &&
 complete -F _dict -o default dict rdict
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dmesg b/completions/dmesg
index 7aad7be5..5fb28e45 100644
--- a/completions/dmesg
+++ b/completions/dmesg
@@ -1,4 +1,4 @@
-# dmesg(1) completion
+# dmesg(1) completion                                      -*- shell-script -*-
 
 _dmesg()
 {
@@ -24,10 +24,4 @@ _dmesg()
 } &&
 complete -F _dmesg dmesg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dnsspoof b/completions/dnsspoof
index 63229704..39bc47eb 100644
--- a/completions/dnsspoof
+++ b/completions/dnsspoof
@@ -1,4 +1,4 @@
-# dnsspoof completion
+# dnsspoof completion                                      -*- shell-script -*-
 
 _dnsspoof()
 {
@@ -23,10 +23,4 @@ _dnsspoof()
 } &&
 complete -F _dnsspoof dnsspoof
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dot b/completions/dot
index 7193ce85..ef946e4b 100644
--- a/completions/dot
+++ b/completions/dot
@@ -1,4 +1,4 @@
-# dot(1) completion
+# dot(1) completion                                        -*- shell-script -*-
 
 _dot()
 {
@@ -42,10 +42,4 @@ _dot()
 } &&
 complete -F _dot dot
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dpkg b/completions/dpkg
index 54236cfc..247171c5 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -1,4 +1,4 @@
-# This function is required by _dpkg() and _dpkg-reconfigure()
+# This function is required by _dpkg and _dpkg-reconfigure -*- shell-script -*-
 
 _have grep-status && {
 _comp_dpkg_installed_packages()
@@ -99,10 +99,4 @@ _dpkg_reconfigure()
 } &&
 complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dpkg-source b/completions/dpkg-source
index 66ac6d58..6cd9bde3 100644
--- a/completions/dpkg-source
+++ b/completions/dpkg-source
@@ -1,4 +1,4 @@
-# Debian dpkg-source completion
+# Debian dpkg-source completion                            -*- shell-script -*-
 
 _dpkg_source()
 {
@@ -104,10 +104,4 @@ _dpkg_source()
 } &&
 complete -F _dpkg_source dpkg-source
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dselect b/completions/dselect
index 94894586..9da1e927 100644
--- a/completions/dselect
+++ b/completions/dselect
@@ -1,4 +1,4 @@
-# Debian Linux dselect(8) completion.
+# Debian Linux dselect(8) completion                       -*- shell-script -*-
 
 _dselect()
 {
@@ -28,10 +28,4 @@ _dselect()
 } &&
 complete -F _dselect dselect
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dsniff b/completions/dsniff
index b0eeedf0..94b34ef6 100644
--- a/completions/dsniff
+++ b/completions/dsniff
@@ -1,4 +1,4 @@
-# dsniff completion
+# dsniff completion                                        -*- shell-script -*-
 
 _dsniff()
 {
@@ -23,10 +23,4 @@ _dsniff()
 } &&
 complete -F _dsniff dsniff
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dumpdb b/completions/dumpdb
index 4f093c6c..461401c3 100644
--- a/completions/dumpdb
+++ b/completions/dumpdb
@@ -1,4 +1,4 @@
-# mailman dumpdb completion
+# mailman dumpdb completion                                -*- shell-script -*-
 
 _dumpdb()
 {
@@ -15,10 +15,4 @@ _dumpdb()
 } &&
 complete -F _dumpdb dumpdb
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/dumpe2fs b/completions/dumpe2fs
index 7597a298..127b46fc 100644
--- a/completions/dumpe2fs
+++ b/completions/dumpe2fs
@@ -1,4 +1,4 @@
-# dumpe2fs(8) completion
+# dumpe2fs(8) completion                                   -*- shell-script -*-
 
 _dumpe2fs()
 {
@@ -25,10 +25,4 @@ _dumpe2fs()
 } &&
 complete -F _dumpe2fs dumpe2fs
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/e2freefrag b/completions/e2freefrag
index 519a6275..6a971156 100644
--- a/completions/e2freefrag
+++ b/completions/e2freefrag
@@ -1,4 +1,4 @@
-# e2freefrag(8) completion
+# e2freefrag(8) completion                                 -*- shell-script -*-
 
 _e2freefrag()
 {
@@ -21,10 +21,4 @@ _e2freefrag()
 } &&
 complete -F _e2freefrag e2freefrag
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/e2label b/completions/e2label
index e6601163..86008d9f 100644
--- a/completions/e2label
+++ b/completions/e2label
@@ -1,4 +1,4 @@
-# e2label(8) completion
+# e2label(8) completion                                    -*- shell-script -*-
 
 _e2label()
 {
@@ -12,10 +12,4 @@ _e2label()
 } &&
 complete -F _e2label e2label
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ether-wake b/completions/ether-wake
index 96ac75af..2142d74e 100644
--- a/completions/ether-wake
+++ b/completions/ether-wake
@@ -1,4 +1,4 @@
-# ether-wake(8) completion
+# ether-wake(8) completion                                 -*- shell-script -*-
 
 _ether_wake()
 {
@@ -24,10 +24,4 @@ _ether_wake()
 } &&
 complete -F _ether_wake ether-wake
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/evince b/completions/evince
index aa5feffe..9c7d0c3a 100644
--- a/completions/evince
+++ b/completions/evince
@@ -1,3 +1,5 @@
+# evince(1) completion                                     -*- shell-script -*-
+
 _evince()
 {
     local cur prev words cword split
@@ -28,10 +30,4 @@ _evince()
 } &&
 complete -F _evince evince
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/explodepkg b/completions/explodepkg
index 3806327e..b6914750 100644
--- a/completions/explodepkg
+++ b/completions/explodepkg
@@ -1,11 +1,5 @@
-# Slackware Linux explodepkg completion
+# Slackware Linux explodepkg completion                    -*- shell-script -*-
 
 complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/export b/completions/export
index a27dc016..557c52cb 100644
--- a/completions/export
+++ b/completions/export
@@ -1,4 +1,4 @@
-# bash export completion
+# bash export completion                                   -*- shell-script -*-
 
 _export()
 {
@@ -22,10 +22,4 @@ _export()
 } &&
 complete -F _export -o default -o nospace export
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/faillog b/completions/faillog
index b7a91d1b..77ca9c72 100644
--- a/completions/faillog
+++ b/completions/faillog
@@ -1,4 +1,4 @@
-# faillog(8) completion
+# faillog(8) completion                                    -*- shell-script -*-
 
 _faillog()
 {
@@ -25,10 +25,4 @@ _faillog()
 } &&
 complete -F _faillog faillog
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/fbgs b/completions/fbgs
index e3687621..672de7cd 100644
--- a/completions/fbgs
+++ b/completions/fbgs
@@ -1,4 +1,4 @@
-# bash completion for fbgs(1)
+# bash completion for fbgs(1)                              -*- shell-script -*-
 
 _fbgs()
 {
@@ -36,10 +36,4 @@ _fbgs()
     _filedir '?(e)ps|pdf'
 } && complete -F _fbgs fbgs
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/fbi b/completions/fbi
index 61540af3..f8f7a825 100644
--- a/completions/fbi
+++ b/completions/fbi
@@ -1,4 +1,4 @@
-# bash completion for fbi(1)
+# bash completion for fbi(1)                               -*- shell-script -*-
 
 _fbi()
 {
@@ -51,10 +51,4 @@ _fbi()
     _filedir 'bmp|gif|jp?(e)g|pcd|png|p[pgb]m|tif?(f)|webp|xpm|xwd|?(e)ps|pdf|dvi|txt|svg?(z)'
 } && complete -F _fbi fbi
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/feh b/completions/feh
index e71386a8..e39b5c31 100644
--- a/completions/feh
+++ b/completions/feh
@@ -1,4 +1,4 @@
-# bash completion for feh(1)
+# bash completion for feh(1)                               -*- shell-script -*-
 
 _feh()
 {
@@ -116,10 +116,4 @@ _feh()
     _filedir 'xpm|tif?(f)|png|p[npgba]m|iff|?(i)lbm|jp?(e)g|jfi?(f)|gif|bmp|arg?(b)|tga|xcf|ani|ico'
 } && complete -F _feh feh
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/file b/completions/file
index 63db2252..172fd5e0 100644
--- a/completions/file
+++ b/completions/file
@@ -1,3 +1,5 @@
+# file(1) completion                                       -*- shell-script -*-
+
 _file()
 {
     local cur prev words cword
@@ -27,10 +29,4 @@ _file()
 } &&
 complete -F _file file
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/filefrag b/completions/filefrag
index 56696671..ee9d0d81 100644
--- a/completions/filefrag
+++ b/completions/filefrag
@@ -1,4 +1,4 @@
-# filefrag(8) completion
+# filefrag(8) completion                                   -*- shell-script -*-
 
 _filefrag()
 {
@@ -14,10 +14,4 @@ _filefrag()
 } &&
 complete -F _filefrag filefrag
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/filesnarf b/completions/filesnarf
index 321b29cb..07c4c741 100644
--- a/completions/filesnarf
+++ b/completions/filesnarf
@@ -1,4 +1,4 @@
-# filesnarf etc completion
+# filesnarf etc completion                                 -*- shell-script -*-
 
 _snarf()
 {
@@ -19,10 +19,4 @@ _snarf()
 } &&
 complete -F _snarf filesnarf mailsnarf msgsnarf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/find b/completions/find
index 1d3a2822..2afb6fc9 100644
--- a/completions/find
+++ b/completions/find
@@ -1,6 +1,6 @@
-# bash completion for GNU find. This makes heavy use of ksh style extended
-# globs and contains Linux specific code for completing the parameter
-# to the -fstype option.
+# bash completion for GNU find                             -*- shell-script -*-
+# This makes heavy use of ksh style extended globs and contains Linux specific
+# code for completing the parameter to the -fstype option.
 
 _find()
 {
@@ -113,10 +113,4 @@ _find()
 } &&
 complete -F _find find
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/find_member b/completions/find_member
index e1ea650e..d306f1be 100644
--- a/completions/find_member
+++ b/completions/find_member
@@ -1,4 +1,4 @@
-# mailman find_member completion
+# mailman find_member completion                           -*- shell-script -*-
 
 _find_member()
 {
@@ -22,10 +22,4 @@ _find_member()
 } &&
 complete -F _find_member find_member
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/freeciv-gtk2 b/completions/freeciv-gtk2
index 1c129979..c818433d 100644
--- a/completions/freeciv-gtk2
+++ b/completions/freeciv-gtk2
@@ -1,4 +1,4 @@
-# freeciv client completions
+# freeciv client completions                               -*- shell-script -*-
 
 _civclient()
 {
@@ -27,10 +27,4 @@ _civclient()
 } &&
 complete -F _civclient civclient freeciv-gtk2 freeciv-sdl freeciv-xaw
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/freeciv-server b/completions/freeciv-server
index 3def8bf1..7daa30ce 100644
--- a/completions/freeciv-server
+++ b/completions/freeciv-server
@@ -1,4 +1,4 @@
-# freeciv-server completion
+# freeciv-server completion                                -*- shell-script -*-
 
 _civserver()
 {
@@ -19,10 +19,4 @@ _civserver()
 } &&
 complete -F _civserver civserver freeciv-server
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/function b/completions/function
index 4916b2ac..6156e63d 100644
--- a/completions/function
+++ b/completions/function
@@ -1,4 +1,4 @@
-# bash shell function completion
+# bash shell function completion                           -*- shell-script -*-
 
 _function()
 {
@@ -19,10 +19,4 @@ _function()
 } &&
 complete -F _function function declare typeset
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/fusermount b/completions/fusermount
index d00cc2a8..fa51b228 100644
--- a/completions/fusermount
+++ b/completions/fusermount
@@ -1,4 +1,4 @@
-# fusermount completion
+# fusermount completion                                    -*- shell-script -*-
 
 _fusermount()
 {
@@ -25,10 +25,4 @@ _fusermount()
 } &&
 complete -F _fusermount fusermount
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gcc b/completions/gcc
index c8825115..bafb81b7 100644
--- a/completions/gcc
+++ b/completions/gcc
@@ -1,4 +1,4 @@
-# gcc(1) completion
+# gcc(1) completion                                        -*- shell-script -*-
 #
 # The only unusual feature is that we don't parse "gcc --help -v" output
 # directly, because that would include the options of all the other backend
@@ -51,10 +51,4 @@ complete -F _gcc gcc g++ c++ g77 gcj gpc
 [[ $OSTYPE == *cygwin* ]] || _userland GNU && _have gcc && \
     complete -F _gcc cc || :
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gcl b/completions/gcl
index f235d59a..2796ca07 100644
--- a/completions/gcl
+++ b/completions/gcl
@@ -1,3 +1,4 @@
+#                                                          -*- shell-script -*-
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -18,10 +19,4 @@ _gcl()
 } &&
 complete -F _gcl -o default gcl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gdb b/completions/gdb
index 5dc832a8..c24407b5 100644
--- a/completions/gdb
+++ b/completions/gdb
@@ -1,4 +1,4 @@
-# bash completion for gdb
+# bash completion for gdb                                  -*- shell-script -*-
 
 _gdb()
 {
@@ -34,10 +34,4 @@ _gdb()
 } &&
 complete -F _gdb gdb
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/genaliases b/completions/genaliases
index d0099146..32f5919a 100644
--- a/completions/genaliases
+++ b/completions/genaliases
@@ -1,4 +1,4 @@
-# mailman genaliases completion
+# mailman genaliases completion                            -*- shell-script -*-
 
 _genaliases()
 {
@@ -12,10 +12,4 @@ _genaliases()
 } &&
 complete -F _genaliases genaliases
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gendiff b/completions/gendiff
index 51ef8a09..38c0828e 100644
--- a/completions/gendiff
+++ b/completions/gendiff
@@ -1,4 +1,4 @@
-# gendiff(1) completion
+# gendiff(1) completion                                    -*- shell-script -*-
 
 _gendiff()
 {
@@ -9,10 +9,4 @@ _gendiff()
 } &&
 complete -F _gendiff gendiff
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/genisoimage b/completions/genisoimage
index b4b11191..3c966515 100644
--- a/completions/genisoimage
+++ b/completions/genisoimage
@@ -1,4 +1,4 @@
-# bash completion for mkisofs/genisoimage
+# bash completion for mkisofs/genisoimage                  -*- shell-script -*-
 
 _mkisofs()
 {
@@ -65,10 +65,4 @@ _mkisofs()
 } &&
 complete -F _mkisofs mkisofs genisoimage
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/getent b/completions/getent
index 34214442..1bb12f52 100644
--- a/completions/getent
+++ b/completions/getent
@@ -1,4 +1,4 @@
-# bash completion for getent
+# bash completion for getent                               -*- shell-script -*-
 
 _getent()
 {
@@ -75,10 +75,4 @@ _getent()
 } &&
 complete -F _getent getent
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gkrellm b/completions/gkrellm
index 9e915134..f7979b96 100644
--- a/completions/gkrellm
+++ b/completions/gkrellm
@@ -1,4 +1,4 @@
-# gkrellm(1) completion
+# gkrellm(1) completion                                    -*- shell-script -*-
 
 _gkrellm()
 {
@@ -39,10 +39,4 @@ _gkrellm()
 } &&
 complete -F _gkrellm gkrellm gkrellm2
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gnatmake b/completions/gnatmake
index 9aac664c..e807d923 100644
--- a/completions/gnatmake
+++ b/completions/gnatmake
@@ -1,4 +1,5 @@
-# Gnatmake completion by Ralf_Schroth@t-online.de (Ralf Schroth)
+# Gnatmake completion                                      -*- shell-script -*-
+# by Ralf_Schroth@t-online.de (Ralf Schroth)
 
 _gnatmake()
 {
@@ -25,10 +26,4 @@ _gnatmake()
 } &&
 complete -F _gnatmake gnatmake
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gnome-mplayer b/completions/gnome-mplayer
index 396c8994..00701702 100644
--- a/completions/gnome-mplayer
+++ b/completions/gnome-mplayer
@@ -1,3 +1,5 @@
+# gnome-mplayer(1) completion                              -*- shell-script -*-
+
 _gnome_mplayer()
 {
     local cur prev words cword split
@@ -34,10 +36,4 @@ _gnome_mplayer()
 } &&
 complete -F _gnome_mplayer gnome-mplayer
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gpasswd b/completions/gpasswd
index 6ac932e3..eb5a7e48 100644
--- a/completions/gpasswd
+++ b/completions/gpasswd
@@ -1,4 +1,4 @@
-# gpasswd(1) completion
+# gpasswd(1) completion                                    -*- shell-script -*-
 
 _gpasswd()
 {
@@ -22,10 +22,4 @@ _gpasswd()
 } &&
 complete -F _gpasswd gpasswd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gpg b/completions/gpg
index 233c7d4e..763086bc 100644
--- a/completions/gpg
+++ b/completions/gpg
@@ -1,4 +1,4 @@
-# bash completion for gpg
+# bash completion for gpg                                  -*- shell-script -*-
 
 _gpg()
 {
@@ -35,10 +35,4 @@ _gpg()
 } &&
 complete -F _gpg -o default gpg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gpg2 b/completions/gpg2
index 7ffc8e24..03d2c5b8 100644
--- a/completions/gpg2
+++ b/completions/gpg2
@@ -1,4 +1,4 @@
-# gpg2(1) completion
+# gpg2(1) completion                                       -*- shell-script -*-
 
 _gpg2()
 {
@@ -39,10 +39,4 @@ _gpg2()
 } &&
 complete -F _gpg2 -o default gpg2
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gprof b/completions/gprof
index 66067740..810255a4 100644
--- a/completions/gprof
+++ b/completions/gprof
@@ -1,3 +1,5 @@
+# gprof(1) completion                                      -*- shell-script -*-
+
 _gprof()
 {
     local cur prev words cword split
@@ -60,10 +62,4 @@ _gprof()
 } &&
 complete -F _gprof gprof
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/groupadd b/completions/groupadd
index f074c20c..db5ff872 100644
--- a/completions/groupadd
+++ b/completions/groupadd
@@ -1,4 +1,4 @@
-# groupadd(8) completion
+# groupadd(8) completion                                   -*- shell-script -*-
 
 _groupadd()
 {
@@ -24,10 +24,4 @@ _groupadd()
 } &&
 complete -F _groupadd groupadd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/groupdel b/completions/groupdel
index 2e7af611..bf6e5c6a 100644
--- a/completions/groupdel
+++ b/completions/groupdel
@@ -1,11 +1,5 @@
-# groupdel(8) completion
+# groupdel(8) completion                                   -*- shell-script -*-
 
 complete -g groupdel
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/groupmems b/completions/groupmems
index 0176cd0e..627f8e01 100644
--- a/completions/groupmems
+++ b/completions/groupmems
@@ -1,4 +1,4 @@
-# groupmems(8) completion
+# groupmems(8) completion                                  -*- shell-script -*-
 
 _groupmems()
 {
@@ -23,10 +23,4 @@ _groupmems()
 } &&
 complete -F _groupmems groupmems
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/groupmod b/completions/groupmod
index 73a4a791..1a0241a7 100644
--- a/completions/groupmod
+++ b/completions/groupmod
@@ -1,4 +1,4 @@
-# groupmod(8) completion
+# groupmod(8) completion                                   -*- shell-script -*-
 
 _groupmod()
 {
@@ -26,10 +26,4 @@ _groupmod()
 } &&
 complete -F _groupmod groupmod
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/growisofs b/completions/growisofs
index 583c5499..c4cb7162 100644
--- a/completions/growisofs
+++ b/completions/growisofs
@@ -1,4 +1,4 @@
-# growisofs(1) completion
+# growisofs(1) completion                                  -*- shell-script -*-
 
 _growisofs()
 {
@@ -36,10 +36,4 @@ _growisofs()
 } &&
 complete -F _growisofs growisofs
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/grpck b/completions/grpck
index 6a1c093b..0aff1439 100644
--- a/completions/grpck
+++ b/completions/grpck
@@ -1,4 +1,4 @@
-# grpck(8) completion
+# grpck(8) completion                                      -*- shell-script -*-
 
 _grpck()
 {
@@ -14,10 +14,4 @@ _grpck()
 } &&
 complete -F _grpck grpck
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/gzip b/completions/gzip
index 4cc10c02..87219630 100644
--- a/completions/gzip
+++ b/completions/gzip
@@ -1,4 +1,4 @@
-# bash completion for gzip
+# bash completion for gzip                                 -*- shell-script -*-
 
 _gzip()
 {
@@ -38,10 +38,4 @@ _gzip()
 } &&
 complete -F _gzip gzip pigz
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/hcitool b/completions/hcitool
index b763867b..417a0c99 100644
--- a/completions/hcitool
+++ b/completions/hcitool
@@ -1,4 +1,4 @@
-# bash completion for bluez utils
+# bash completion for bluez utils                          -*- shell-script -*-
 
 _bluetooth_adresses()
 {
@@ -376,10 +376,4 @@ _hciattach()
 } &&
 complete -F _hciattach hciattach
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/hddtemp b/completions/hddtemp
index e0afc40c..75641045 100644
--- a/completions/hddtemp
+++ b/completions/hddtemp
@@ -1,4 +1,4 @@
-# hddtemp(8) completion
+# hddtemp(8) completion                                    -*- shell-script -*-
 
 _hddtemp()
 {
@@ -35,10 +35,4 @@ _hddtemp()
 } &&
 complete -F _hddtemp hddtemp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/hid2hci b/completions/hid2hci
index 2c49cf7f..4e2ef039 100644
--- a/completions/hid2hci
+++ b/completions/hid2hci
@@ -1,4 +1,4 @@
-# hid2hci completion
+# hid2hci completion                                       -*- shell-script -*-
 
 _hid2hci()
 {
@@ -12,10 +12,4 @@ _hid2hci()
 } &&
 complete -F _hid2hci hid2hci
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/hping2 b/completions/hping2
index dfdd3c21..45c2c4c6 100644
--- a/completions/hping2
+++ b/completions/hping2
@@ -1,4 +1,4 @@
-# bash completion for hping2
+# bash completion for hping2                               -*- shell-script -*-
 
 _hping2()
 {
@@ -32,10 +32,4 @@ _hping2()
 } &&
 complete -F _hping2 hping hping2 hping3
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/htpasswd b/completions/htpasswd
index 76b82aa4..b0990fe1 100644
--- a/completions/htpasswd
+++ b/completions/htpasswd
@@ -1,4 +1,4 @@
-# htpasswd(1) completion
+# htpasswd(1) completion                                   -*- shell-script -*-
 
 _htpasswd()
 {
@@ -30,10 +30,4 @@ _htpasswd()
 } &&
 complete -F _htpasswd htpasswd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iconv b/completions/iconv
index 7c4dc086..b33cc704 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -1,4 +1,4 @@
-# iconv(1) completion
+# iconv(1) completion                                      -*- shell-script -*-
 
 _iconv()
 {
@@ -31,10 +31,4 @@ _iconv()
 } &&
 complete -F _iconv -o default iconv
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/id b/completions/id
index 6c15c829..c985c9eb 100644
--- a/completions/id
+++ b/completions/id
@@ -1,4 +1,4 @@
-# id(1) completion
+# id(1) completion                                         -*- shell-script -*-
 
 _id()
 {
@@ -15,10 +15,4 @@ _id()
 } &&
 complete -F _id id
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/idn b/completions/idn
index 8b57ef3d..14e4cc1a 100644
--- a/completions/idn
+++ b/completions/idn
@@ -1,3 +1,5 @@
+# idn(1) completion                                        -*- shell-script -*-
+
 _idn()
 {
     local cur prev words cword split
@@ -21,10 +23,4 @@ _idn()
 } &&
 complete -F _idn idn
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iftop b/completions/iftop
index 8e995771..8c606172 100644
--- a/completions/iftop
+++ b/completions/iftop
@@ -1,4 +1,4 @@
-# iftop(8) completion
+# iftop(8) completion                                      -*- shell-script -*-
 
 _iftop()
 {
@@ -23,10 +23,4 @@ _iftop()
 } &&
 complete -F _iftop iftop
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ifup b/completions/ifup
index 0da6b69f..fee87d6b 100644
--- a/completions/ifup
+++ b/completions/ifup
@@ -1,4 +1,4 @@
-# Red Hat & Debian GNU/Linux if{up,down} completion
+# Red Hat & Debian GNU/Linux if{up,down} completion        -*- shell-script -*-
 
 _userland GNU || return 1
 
@@ -16,10 +16,4 @@ _ifupdown()
 } &&
 complete -F _ifupdown ifup ifdown ifstatus
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/info b/completions/info
index 962dec94..aa16be69 100644
--- a/completions/info
+++ b/completions/info
@@ -1,4 +1,4 @@
-# bash completion for info
+# bash completion for info                                 -*- shell-script -*-
 
 _info()
 {
@@ -74,10 +74,4 @@ _info()
 } &&
 complete -F _info info pinfo
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/inject b/completions/inject
index 1e4d9d4c..da2d9a9e 100644
--- a/completions/inject
+++ b/completions/inject
@@ -1,4 +1,4 @@
-# mailman inject completion
+# mailman inject completion                                -*- shell-script -*-
 
 _inject()
 {
@@ -23,10 +23,4 @@ _inject()
 } &&
 complete -F _inject inject
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/insmod b/completions/insmod
index fa84d76e..725678e8 100644
--- a/completions/insmod
+++ b/completions/insmod
@@ -1,6 +1,6 @@
-# Linux insmod(8), modprobe(8) and modinfo(8) completion. This completes on a
-# list of all available modules for the version of the kernel currently
-# running.
+# Linux insmod(8), modprobe(8) and modinfo(8) completion   -*- shell-script -*-
+# This completes on the list of all available modules for the version of the
+# kernel currently running.
 #
 _insmod()
 {
@@ -31,10 +31,4 @@ _insmod()
 } &&
 complete -F _insmod insmod modprobe modinfo
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/installpkg b/completions/installpkg
index 12997588..956f5d0c 100644
--- a/completions/installpkg
+++ b/completions/installpkg
@@ -1,4 +1,4 @@
-# Slackware Linux installpkg completion
+# Slackware Linux installpkg completion                    -*- shell-script -*-
 
 _installpkg()
 {
@@ -29,10 +29,4 @@ _installpkg()
     _filedir "t[bglx]z"
 } && complete -F _installpkg installpkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/invoke-rc.d b/completions/invoke-rc.d
index 670e9968..fd2c1db0 100644
--- a/completions/invoke-rc.d
+++ b/completions/invoke-rc.d
@@ -1,4 +1,4 @@
-# invoke-rc.d(8) completion
+# invoke-rc.d(8) completion                                -*- shell-script -*-
 #
 # Copyright (C) 2004 Servilio Afre Puentes <servilio@gmail.com>
 
@@ -36,10 +36,4 @@ _invoke_rc_d()
 } &&
 complete -F _invoke_rc_d invoke-rc.d
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ionice b/completions/ionice
index 0af68a7a..6d9bdd46 100644
--- a/completions/ionice
+++ b/completions/ionice
@@ -1,4 +1,4 @@
-# ionice(1) completion
+# ionice(1) completion                                     -*- shell-script -*-
 
 _ionice()
 {
@@ -54,10 +54,4 @@ _ionice()
 } &&
 complete -F _ionice ionice
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ip b/completions/ip
index 0d431e4f..08ee74fe 100644
--- a/completions/ip
+++ b/completions/ip
@@ -1,4 +1,4 @@
-# ip(8) completion
+# ip(8) completion                                         -*- shell-script -*-
 
 _ip()
 {
@@ -274,10 +274,4 @@ _ip()
 } &&
 complete -F _ip ip
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ipmitool b/completions/ipmitool
index 6a1911b2..81a6466f 100644
--- a/completions/ipmitool
+++ b/completions/ipmitool
@@ -1,4 +1,4 @@
-# bash completion for ipmitool
+# bash completion for ipmitool                             -*- shell-script -*-
 
 _ipmitool_singleline_help()
 {
@@ -197,10 +197,4 @@ _ipmitool()
 } &&
 complete -F _ipmitool ipmitool
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ipsec b/completions/ipsec
index d24e80b8..1a081028 100644
--- a/completions/ipsec
+++ b/completions/ipsec
@@ -1,5 +1,4 @@
-# Linux ipsec(8) completion (for FreeS/WAN and strongSwan)
-#
+# Linux ipsec(8) completion (for FreeS/WAN and strongSwan) -*- shell-script -*-
 
 # Complete ipsec.conf conn entries.
 #
@@ -106,10 +105,4 @@ case "$( ipsec --version 2>/dev/null )" in
         ;;
 esac
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iptables b/completions/iptables
index c554a26b..b9314f23 100644
--- a/completions/iptables
+++ b/completions/iptables
@@ -1,4 +1,4 @@
-# bash completion for iptables
+# bash completion for iptables                             -*- shell-script -*-
 
 _iptables()
 {
@@ -57,10 +57,4 @@ _iptables()
 } &&
 complete -F _iptables iptables
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ipv6calc b/completions/ipv6calc
index 6aa4a55a..102f8327 100644
--- a/completions/ipv6calc
+++ b/completions/ipv6calc
@@ -1,3 +1,5 @@
+# ipv6calc completion                                      -*- shell-script -*-
+
 _ipv6calc()
 {
     local cur prev words cword split
@@ -41,10 +43,4 @@ _ipv6calc()
 } &&
 complete -F _ipv6calc ipv6calc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iscsiadm b/completions/iscsiadm
index 46170635..326dc208 100644
--- a/completions/iscsiadm
+++ b/completions/iscsiadm
@@ -1,4 +1,4 @@
-# iscsiadm(1) completion
+# iscsiadm(1) completion                                   -*- shell-script -*-
 
 _iscsiadm()
 {
@@ -63,10 +63,4 @@ _iscsiadm()
 } &&
 complete -F _iscsiadm iscsiadm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/isql b/completions/isql
index 1e79b55d..695654f3 100644
--- a/completions/isql
+++ b/completions/isql
@@ -1,4 +1,5 @@
-# isql completion by Victor Bogado da Silva Lins <victor@bogado.net>
+# isql completion                                          -*- shell-script -*-
+# by Victor Bogado da Silva Lins <victor@bogado.net>
 
 _isql()
 {
@@ -10,10 +11,4 @@ _isql()
 } &&
 complete -F _isql isql
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iwconfig b/completions/iwconfig
index 247d648a..81dda723 100644
--- a/completions/iwconfig
+++ b/completions/iwconfig
@@ -1,4 +1,4 @@
-# iwconfig completion
+# iwconfig completion                                      -*- shell-script -*-
 
 _iwconfig()
 {
@@ -87,10 +87,4 @@ _iwconfig()
 } &&
 complete -F _iwconfig iwconfig
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iwlist b/completions/iwlist
index a68ad73a..39bfa0f1 100644
--- a/completions/iwlist
+++ b/completions/iwlist
@@ -1,4 +1,4 @@
-# iwlist completion
+# iwlist completion                                        -*- shell-script -*-
 
 _iwlist()
 {
@@ -19,10 +19,4 @@ _iwlist()
 } &&
 complete -F _iwlist iwlist
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iwpriv b/completions/iwpriv
index 45ffadbd..b0d45043 100644
--- a/completions/iwpriv
+++ b/completions/iwpriv
@@ -1,4 +1,4 @@
-# iwpriv completion
+# iwpriv completion                                        -*- shell-script -*-
 
 _iwpriv()
 {
@@ -28,10 +28,4 @@ _iwpriv()
 } &&
 complete -F _iwpriv iwpriv
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iwspy b/completions/iwspy
index c5219b37..4bffc76e 100644
--- a/completions/iwspy
+++ b/completions/iwspy
@@ -1,4 +1,4 @@
-# iwspy completion
+# iwspy completion                                         -*- shell-script -*-
 
 _iwspy()
 {
@@ -17,10 +17,4 @@ _iwspy()
 } &&
 complete -F _iwspy iwspy
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/jar b/completions/jar
index 48517bda..f16d7f70 100644
--- a/completions/jar
+++ b/completions/jar
@@ -1,4 +1,4 @@
-# jar(1) completion
+# jar(1) completion                                        -*- shell-script -*-
 
 _jar()
 {
@@ -24,10 +24,4 @@ _jar()
 } &&
 complete -F _jar jar
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/jarsigner b/completions/jarsigner
index 982f7a4b..02befae7 100644
--- a/completions/jarsigner
+++ b/completions/jarsigner
@@ -1,4 +1,4 @@
-# jarsigner(1) completion
+# jarsigner(1) completion                                  -*- shell-script -*-
 
 _jarsigner()
 {
@@ -53,10 +53,4 @@ _jarsigner()
 } &&
 complete -F _jarsigner jarsigner
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/java b/completions/java
index bd8b6471..e02f7369 100644
--- a/completions/java
+++ b/completions/java
@@ -1,4 +1,4 @@
-# bash completion for java, javac and javadoc
+# bash completion for java, javac and javadoc              -*- shell-script -*-
 
 # available path elements completion
 _java_path()
@@ -315,10 +315,4 @@ _javac()
 } &&
 complete -F _javac javac
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/javaws b/completions/javaws
index 03f6c883..b9afefd7 100644
--- a/completions/javaws
+++ b/completions/javaws
@@ -1,4 +1,4 @@
-# javaws(1) completion
+# javaws(1) completion                                     -*- shell-script -*-
 
 _javaws()
 {
@@ -31,10 +31,4 @@ _javaws()
 } &&
 complete -F _javaws javaws
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/jps b/completions/jps
index bf62d573..774ad6ce 100644
--- a/completions/jps
+++ b/completions/jps
@@ -1,4 +1,4 @@
-# jps(1) completion
+# jps(1) completion                                        -*- shell-script -*-
 
 _jps()
 {
@@ -22,10 +22,4 @@ _jps()
 } &&
 complete -F _jps jps
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/k3b b/completions/k3b
index 94a75c33..9c03642f 100644
--- a/completions/k3b
+++ b/completions/k3b
@@ -1,4 +1,4 @@
-# bash completion for k3b
+# bash completion for k3b                                  -*- shell-script -*-
 
 _k3b()
 {
@@ -45,10 +45,4 @@ _k3b()
 } &&
 complete -F _k3b k3b
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/kcov b/completions/kcov
index 737b7b0f..e0f37fdb 100644
--- a/completions/kcov
+++ b/completions/kcov
@@ -1,3 +1,5 @@
+# kcov completion                                          -*- shell-script -*-
+
 _kcov()
 {
     local cur prev words cword split
@@ -34,10 +36,4 @@ _kcov()
     _filedir
 } && complete -F _kcov kcov
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/kill b/completions/kill
index 150f2116..ed5ae585 100644
--- a/completions/kill
+++ b/completions/kill
@@ -1,4 +1,4 @@
-# kill(1) completion
+# kill(1) completion                                       -*- shell-script -*-
 
 _kill()
 {
@@ -26,10 +26,4 @@ _kill()
 } &&
 complete -F _kill kill
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/killall b/completions/killall
index 9a17ec25..d2f6dd47 100644
--- a/completions/killall
+++ b/completions/killall
@@ -1,4 +1,4 @@
-# killall(1) (Linux, FreeBSD and Darwin) and pkill(1) completion.
+# killall(1) and pkill(1) completion                       -*- shell-script -*-
 
 _killall()
 {
@@ -32,10 +32,4 @@ _killall()
 complete -F _killall pkill
 [[ $OSTYPE == *@(linux|freebsd|darwin)* ]] && complete -F _killall killall || :
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/kldload b/completions/kldload
index ddd103f3..26ab0e19 100644
--- a/completions/kldload
+++ b/completions/kldload
@@ -1,4 +1,4 @@
-# FreeBSD kldload completion
+# FreeBSD kldload completion                               -*- shell-script -*-
 
 [[ $OSTYPE == *freebsd* ]] || return 1
 
@@ -19,10 +19,4 @@ _kldload()
 } &&
 complete -F _kldload kldload
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/kldunload b/completions/kldunload
index 3776e69c..adb268d8 100644
--- a/completions/kldunload
+++ b/completions/kldunload
@@ -1,4 +1,4 @@
-# FreeBSD kldunload completion
+# FreeBSD kldunload completion                             -*- shell-script -*-
 
 [[ $OSTYPE == *freebsd* ]] || return 1
 
@@ -12,10 +12,4 @@ _kldunload()
 } &&
 complete -F _kldunload kldunload
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ktutil b/completions/ktutil
index bda4ae14..e0bd60bf 100644
--- a/completions/ktutil
+++ b/completions/ktutil
@@ -1,4 +1,4 @@
-# ktutil completion
+# ktutil completion                                        -*- shell-script -*-
 
 _heimdal_principals()
 {
@@ -117,10 +117,4 @@ _ktutil()
 } &&
 complete -F _ktutil ktutil
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/larch b/completions/larch
index 84272995..f6f796b2 100644
--- a/completions/larch
+++ b/completions/larch
@@ -1,4 +1,5 @@
-# larch(1) completion by Alex Shinn <foof@synthcode.com>
+# larch(1) completion                                      -*- shell-script -*-
+# by Alex Shinn <foof@synthcode.com>
 
 _larch()
 {
@@ -36,10 +37,4 @@ _larch()
 } &&
 complete -F _larch -o default larch
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lastlog b/completions/lastlog
index cadc518b..8663afd7 100644
--- a/completions/lastlog
+++ b/completions/lastlog
@@ -1,4 +1,4 @@
-# lastlog(8) completion
+# lastlog(8) completion                                    -*- shell-script -*-
 
 _lastlog()
 {
@@ -25,10 +25,4 @@ _lastlog()
 } &&
 complete -F _lastlog lastlog
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ldapsearch b/completions/ldapsearch
index 7bdf29f4..6a9b7b1b 100644
--- a/completions/ldapsearch
+++ b/completions/ldapsearch
@@ -1,4 +1,4 @@
-# bash completion for openldap
+# bash completion for openldap                             -*- shell-script -*-
 
 _ldap_uris()
 {
@@ -229,10 +229,4 @@ _ldappasswd()
 } &&
 complete -F _ldappasswd ldappasswd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ldapvi b/completions/ldapvi
index ea77e10d..f2d2c293 100644
--- a/completions/ldapvi
+++ b/completions/ldapvi
@@ -1,4 +1,4 @@
-# bash completion for ldapvi
+# bash completion for ldapvi                               -*- shell-script -*-
 
 _ldapvi()
 {
@@ -49,10 +49,4 @@ _ldapvi()
 } &&
 complete -F _ldapvi ldapvi
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lftp b/completions/lftp
index 9e47ae16..86706002 100644
--- a/completions/lftp
+++ b/completions/lftp
@@ -1,4 +1,4 @@
-# lftp(1) completion
+# lftp(1) completion                                       -*- shell-script -*-
 
 _lftp()
 {
@@ -26,10 +26,4 @@ _lftp()
 } &&
 complete -F _lftp lftp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lftpget b/completions/lftpget
index 9ed6a5c7..88ab31f6 100644
--- a/completions/lftpget
+++ b/completions/lftpget
@@ -1,4 +1,4 @@
-# lftpget(1) completion
+# lftpget(1) completion                                    -*- shell-script -*-
 
 _lftpget()
 {
@@ -11,10 +11,4 @@ _lftpget()
 } &&
 complete -F _lftpget lftpget
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lilo b/completions/lilo
index 712268d4..f81f049a 100644
--- a/completions/lilo
+++ b/completions/lilo
@@ -1,4 +1,4 @@
-# bash completion for lilo(8)
+# bash completion for lilo(8)                              -*- shell-script -*-
 
 _lilo_labels()
 {
@@ -47,10 +47,4 @@ _lilo()
 } &&
 complete -F _lilo lilo
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/links b/completions/links
index 822fe439..a212fa5a 100644
--- a/completions/links
+++ b/completions/links
@@ -1,4 +1,4 @@
-# bash completion for links
+# bash completion for links                                -*- shell-script -*-
 
 _links()
 {
@@ -31,10 +31,4 @@ _links()
 } &&
 complete -F _links links
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lintian b/completions/lintian
index 59af7a0a..65121151 100644
--- a/completions/lintian
+++ b/completions/lintian
@@ -1,7 +1,4 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
-# bash completion for lintian(1) and lintian-info(1)
+# bash completion for lintian(1) and lintian-info(1)       -*- shell-script -*-
 
 _lintian_tags()
 {
@@ -181,10 +178,4 @@ _lintian_info()
 } &&
 complete -F _lintian_info lintian-info
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lisp b/completions/lisp
index cb1f899d..941eae44 100644
--- a/completions/lisp
+++ b/completions/lisp
@@ -1,3 +1,4 @@
+#                                                          -*- shell-script -*-
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -19,10 +20,4 @@ _lisp()
 } &&
 complete -F _lisp -o default lisp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/list_admins b/completions/list_admins
index 6ffeafe1..6c05a7d3 100644
--- a/completions/list_admins
+++ b/completions/list_admins
@@ -1,4 +1,4 @@
-# mailman list_admins completion
+# mailman list_admins completion                           -*- shell-script -*-
 
 _list_admins()
 {
@@ -14,10 +14,4 @@ _list_admins()
 } &&
 complete -F _list_admins list_admins
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/list_lists b/completions/list_lists
index 7209ea76..8ef2156a 100644
--- a/completions/list_lists
+++ b/completions/list_lists
@@ -1,4 +1,4 @@
-# mailman list_lists completion
+# mailman list_lists completion                            -*- shell-script -*-
 
 _mailman_lists()
 {
@@ -18,10 +18,4 @@ _list_lists()
 } &&
 complete -F _list_lists list_lists
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/list_members b/completions/list_members
index 7b49b20f..b6262b7c 100644
--- a/completions/list_members
+++ b/completions/list_members
@@ -1,4 +1,4 @@
-# mailman list_members completion
+# mailman list_members completion                          -*- shell-script -*-
 
 _list_members()
 {
@@ -33,10 +33,4 @@ _list_members()
 } &&
 complete -F _list_members list_members
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/list_owners b/completions/list_owners
index eb88cba5..e4d67505 100644
--- a/completions/list_owners
+++ b/completions/list_owners
@@ -1,4 +1,4 @@
-# mailman list_owners completion
+# mailman list_owners completion                           -*- shell-script -*-
 
 _list_owners()
 {
@@ -15,10 +15,4 @@ _list_owners()
 } &&
 complete -F _list_owners list_owners
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/look b/completions/look
index e339958e..df914452 100644
--- a/completions/look
+++ b/completions/look
@@ -1,4 +1,4 @@
-# look(1) completion
+# look(1) completion                                       -*- shell-script -*-
 
 _look()
 {
@@ -11,10 +11,4 @@ _look()
 } &&
 complete -F _look -o default look
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lpq b/completions/lpq
index 13bfc426..d667713e 100644
--- a/completions/lpq
+++ b/completions/lpq
@@ -1,4 +1,4 @@
-# lpq(1) completion
+# lpq(1) completion                                        -*- shell-script -*-
 
 _lpq()
 {
@@ -25,10 +25,4 @@ _lpq()
 } &&
 complete -F _lpq lpq
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lpr b/completions/lpr
index 6c121df6..35ddd625 100644
--- a/completions/lpr
+++ b/completions/lpr
@@ -1,4 +1,4 @@
-# lpr(1) completion
+# lpr(1) completion                                        -*- shell-script -*-
 
 _lpr()
 {
@@ -30,10 +30,4 @@ _lpr()
 } &&
 complete -F _lpr lpr
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lrzip b/completions/lrzip
index 50af8b48..1569dab4 100644
--- a/completions/lrzip
+++ b/completions/lrzip
@@ -1,4 +1,4 @@
-# lrzip(1) completion
+# lrzip(1) completion                                      -*- shell-script -*-
 
 _lrzip()
 {
@@ -57,10 +57,4 @@ _lrzip()
 } &&
 complete -F _lrzip lrzip
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lsof b/completions/lsof
index a1e215bc..6ff7786c 100644
--- a/completions/lsof
+++ b/completions/lsof
@@ -1,4 +1,4 @@
-# lsof(8) completion
+# lsof(8) completion                                       -*- shell-script -*-
 
 _lsof()
 {
@@ -53,10 +53,4 @@ _lsof()
 } &&
 complete -F _lsof lsof
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lvm b/completions/lvm
index e8823913..7b353114 100644
--- a/completions/lvm
+++ b/completions/lvm
@@ -1,4 +1,4 @@
-# bash completion for lvm
+# bash completion for lvm                                  -*- shell-script -*-
 
 _volumegroups()
 {
@@ -949,10 +949,4 @@ _lvm()
 } &&
 complete -F _lvm lvm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lzma b/completions/lzma
index 415cf79c..d377d15f 100644
--- a/completions/lzma
+++ b/completions/lzma
@@ -1,4 +1,5 @@
-# lzma(1) completion by Per Øyvind Karlsen <peroyvind@mandriva.org>
+# lzma(1) completion                                       -*- shell-script -*-
+# by Per Øyvind Karlsen <peroyvind@mandriva.org>
 
 _lzma()
 {
@@ -33,10 +34,4 @@ _lzma()
 } &&
 complete -F _lzma lzma
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/lzop b/completions/lzop
index 41091d77..a5084bb0 100644
--- a/completions/lzop
+++ b/completions/lzop
@@ -1,4 +1,4 @@
-# lzop(1) completion
+# lzop(1) completion                                       -*- shell-script -*-
 
 _lzop()
 {
@@ -57,10 +57,4 @@ _lzop()
 } &&
 complete -F _lzop lzop
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/macof b/completions/macof
index 6819674e..b81b630a 100644
--- a/completions/macof
+++ b/completions/macof
@@ -1,4 +1,4 @@
-# macof completion
+# macof completion                                         -*- shell-script -*-
 
 _macof()
 {
@@ -20,10 +20,4 @@ _macof()
 } &&
 complete -F _macof macof
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mailmanctl b/completions/mailmanctl
index 4ff61691..4a49668f 100644
--- a/completions/mailmanctl
+++ b/completions/mailmanctl
@@ -1,4 +1,4 @@
-# mailmanctl completion
+# mailmanctl completion                                    -*- shell-script -*-
 
 _mailmanctl()
 {
@@ -15,10 +15,4 @@ _mailmanctl()
 } &&
 complete -F _mailmanctl mailmanctl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/make b/completions/make
index c2b73145..d56e1962 100644
--- a/completions/make
+++ b/completions/make
@@ -1,4 +1,4 @@
-# bash completion for GNU make
+# bash completion for GNU make                             -*- shell-script -*-
 
 _make()
 {
@@ -66,10 +66,4 @@ _make()
 } &&
 complete -F _make make gmake gnumake pmake
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/makepkg b/completions/makepkg
index f5003cad..c24c9cc4 100644
--- a/completions/makepkg
+++ b/completions/makepkg
@@ -1,4 +1,4 @@
-# Slackware Linux makepkg completion
+# Slackware Linux makepkg completion                       -*- shell-script -*-
 
 _makepkg()
 {
@@ -21,10 +21,4 @@ _makepkg()
     _filedir
 } && complete -F _makepkg makepkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/man b/completions/man
index e7f82fa8..5c134d33 100644
--- a/completions/man
+++ b/completions/man
@@ -1,4 +1,4 @@
-# man(1) completion
+# man(1) completion                                        -*- shell-script -*-
 
 [[ $OSTYPE == *@(darwin|freebsd|solaris|cygwin|openbsd)* ]] || _userland GNU \
     || return 1
@@ -101,10 +101,4 @@ _man()
 } &&
 complete -F _man man apropos whatis
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mc b/completions/mc
index 8444e522..f3065793 100644
--- a/completions/mc
+++ b/completions/mc
@@ -1,4 +1,4 @@
-# bash completion for mc
+# bash completion for mc                                   -*- shell-script -*-
 
 _mc()
 {
@@ -32,10 +32,4 @@ _mc()
 } &&
 complete -F _mc mc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mcrypt b/completions/mcrypt
index 824907ed..8c7d189c 100644
--- a/completions/mcrypt
+++ b/completions/mcrypt
@@ -1,4 +1,5 @@
-# mcrypt(1) completion by Ariel Fermani <the_end@bbs.frc.utn.edu.ar>
+# mcrypt(1) completion                                     -*- shell-script -*-
+# by Ariel Fermani <the_end@bbs.frc.utn.edu.ar>
 
 _mcrypt()
 {
@@ -64,10 +65,4 @@ _mcrypt()
 } &&
 complete -F _mcrypt mcrypt mdecrypt
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mdadm b/completions/mdadm
index d36e20b0..f0e917fd 100644
--- a/completions/mdadm
+++ b/completions/mdadm
@@ -1,4 +1,4 @@
-# bash completion for mdadm
+# bash completion for mdadm                                -*- shell-script -*-
 
 _mdadm_raid_level()
 {
@@ -148,10 +148,4 @@ _mdadm()
 } &&
 complete -F _mdadm mdadm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mdtool b/completions/mdtool
index 5b052b93..43358865 100644
--- a/completions/mdtool
+++ b/completions/mdtool
@@ -1,4 +1,4 @@
-# mdtool completion
+# mdtool completion                                        -*- shell-script -*-
 
 _mdtool()
 {
@@ -59,10 +59,4 @@ _mdtool()
 } &&
 complete -F _mdtool mdtool
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/medusa b/completions/medusa
index a9837afa..84a03813 100644
--- a/completions/medusa
+++ b/completions/medusa
@@ -1,4 +1,4 @@
-# bash completion for medusa
+# bash completion for medusa                               -*- shell-script -*-
 
 _medusa()
 {
@@ -27,10 +27,4 @@ _medusa()
 } &&
 complete -F _medusa medusa
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mii-diag b/completions/mii-diag
index 1b19e0c6..5e94877f 100644
--- a/completions/mii-diag
+++ b/completions/mii-diag
@@ -1,4 +1,4 @@
-# mii-diag(8) completion
+# mii-diag(8) completion                                   -*- shell-script -*-
 
 _mii_diag()
 {
@@ -24,10 +24,4 @@ _mii_diag()
 } &&
 complete -F _mii_diag -o default mii-diag
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mii-tool b/completions/mii-tool
index 9cb4d70b..effaa1db 100644
--- a/completions/mii-tool
+++ b/completions/mii-tool
@@ -1,4 +1,4 @@
-# mii-tool(8) completion
+# mii-tool(8) completion                                   -*- shell-script -*-
 
 _mii_tool()
 {
@@ -29,10 +29,4 @@ _mii_tool()
 } &&
 complete -F _mii_tool -o default mii-tool
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/minicom b/completions/minicom
index fd9c0c5b..6bac50ba 100644
--- a/completions/minicom
+++ b/completions/minicom
@@ -1,4 +1,4 @@
-# bash completion for minicom
+# bash completion for minicom                              -*- shell-script -*-
 
 _minicom()
 {
@@ -42,10 +42,4 @@ _minicom()
 } &&
 complete -F _minicom -o default minicom
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mkinitrd b/completions/mkinitrd
index 122ff001..c54f22a2 100644
--- a/completions/mkinitrd
+++ b/completions/mkinitrd
@@ -1,4 +1,4 @@
-# bash completion for mkinitrd
+# bash completion for mkinitrd                             -*- shell-script -*-
 
 _mkinitrd()
 {
@@ -47,10 +47,4 @@ _mkinitrd()
 } &&
 complete -F _mkinitrd mkinitrd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mktemp b/completions/mktemp
index cdb0e822..3871e708 100644
--- a/completions/mktemp
+++ b/completions/mktemp
@@ -1,4 +1,4 @@
-# mktemp(1) completion
+# mktemp(1) completion                                     -*- shell-script -*-
 
 _mktemp()
 {
@@ -26,10 +26,4 @@ _mktemp()
 } &&
 complete -F _mktemp mktemp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mmsitepass b/completions/mmsitepass
index a07c272a..71fc8b09 100644
--- a/completions/mmsitepass
+++ b/completions/mmsitepass
@@ -1,4 +1,4 @@
-# mailman mmsitepass completion
+# mailman mmsitepass completion                            -*- shell-script -*-
 
 _mmsitepass()
 {
@@ -12,10 +12,4 @@ _mmsitepass()
 } &&
 complete -F _mmsitepass mmsitepass
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/monodevelop b/completions/monodevelop
index 50cf5784..9102b8bb 100644
--- a/completions/monodevelop
+++ b/completions/monodevelop
@@ -1,4 +1,4 @@
-# monodevelop completion
+# monodevelop completion                                   -*- shell-script -*-
 
 _monodevelop()
 {
@@ -17,10 +17,4 @@ _monodevelop()
 } &&
 complete -F _monodevelop monodevelop
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mount b/completions/mount
index 25f58f10..48bc7b03 100644
--- a/completions/mount
+++ b/completions/mount
@@ -1,4 +1,5 @@
-# mount(8) completion. This will pull a list of possible mounts out of
+# mount(8) completion                                      -*- shell-script -*-
+# This will pull a list of possible mounts out of
 # /etc/{,v}fstab, unless the word being completed contains a ':', which
 # would indicate the specification of an NFS server. In that case, we
 # query the server for a list of all available exports and complete on
@@ -150,10 +151,4 @@ _umount()
 } &&
 complete -F _umount -o dirnames umount
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mplayer b/completions/mplayer
index 278d1c55..cd39d309 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -1,4 +1,4 @@
-# mplayer(1) completion
+# mplayer(1) completion                                    -*- shell-script -*-
 
 _mplayer_options_list()
 {
@@ -256,10 +256,4 @@ _mplayer()
 } &&
 complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/msynctool b/completions/msynctool
index 161d6072..db48e1b7 100644
--- a/completions/msynctool
+++ b/completions/msynctool
@@ -1,4 +1,4 @@
-# bash completion for msynctool
+# bash completion for msynctool                            -*- shell-script -*-
 
 _msynctool()
 {
@@ -39,10 +39,4 @@ _msynctool()
 } &&
 complete -F _msynctool msynctool
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mtx b/completions/mtx
index 12fa12f1..0dae92ae 100644
--- a/completions/mtx
+++ b/completions/mtx
@@ -1,4 +1,5 @@
-# mtx completion by Jon Middleton <jjm@ixtab.org.uk>
+# mtx completion                                           -*- shell-script -*-
+# by Jon Middleton <jjm@ixtab.org.uk>
 
 _mtx()
 {
@@ -41,10 +42,4 @@ _mtx()
 } &&
 complete -F _mtx mtx
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/munin-node-configure b/completions/munin-node-configure
index 2e4e4b16..7f1d5a59 100644
--- a/completions/munin-node-configure
+++ b/completions/munin-node-configure
@@ -1,4 +1,4 @@
-# munin-node-configure completion
+# munin-node-configure completion                          -*- shell-script -*-
 
 _munin_node_configure()
 {
@@ -30,10 +30,4 @@ _munin_node_configure()
 } &&
 complete -F _munin_node_configure munin-node-configure
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/munin-run b/completions/munin-run
index 03c686d0..756a0e0a 100644
--- a/completions/munin-run
+++ b/completions/munin-run
@@ -1,4 +1,4 @@
-# munin-run completion
+# munin-run completion                                     -*- shell-script -*-
 
 _munin_run()
 {
@@ -25,10 +25,4 @@ _munin_run()
 } &&
 complete -F _munin_run munin-run
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/munin-update b/completions/munin-update
index d7799fbf..f92f2f19 100644
--- a/completions/munin-update
+++ b/completions/munin-update
@@ -1,4 +1,4 @@
-# munin-update completion
+# munin-update completion                                  -*- shell-script -*-
 
 _munin_update()
 {
@@ -24,10 +24,4 @@ _munin_update()
 } &&
 complete -F _munin_update munin-update
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/munindoc b/completions/munindoc
index 527037ee..c5a03c1c 100644
--- a/completions/munindoc
+++ b/completions/munindoc
@@ -1,4 +1,4 @@
-# munindoc completion
+# munindoc completion                                      -*- shell-script -*-
 
 _munindoc()
 {
@@ -10,10 +10,4 @@ _munindoc()
 } &&
 complete -F _munindoc munindoc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mutt b/completions/mutt
index 374e2f1b..70699a15 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -1,4 +1,4 @@
-# mutt completion
+# mutt completion                                          -*- shell-script -*-
 #
 # Mutt doesn't have an "addressbook" like Pine, but it has aliases and
 # a "query" function to retrieve addresses, so that's what we use here.
@@ -171,10 +171,4 @@ _mutt()
 } &&
 complete -F _mutt -o default mutt muttng
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mysql b/completions/mysql
index 24fc7da4..effd313c 100644
--- a/completions/mysql
+++ b/completions/mysql
@@ -1,4 +1,4 @@
-# mysql(1) completion
+# mysql(1) completion                                      -*- shell-script -*-
 
 _mysql()
 {
@@ -79,10 +79,4 @@ _mysql()
 } &&
 complete -F _mysql mysql
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/mysqladmin b/completions/mysqladmin
index d79460b8..fd8c3186 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -1,4 +1,4 @@
-# bash completion for mysqladmin
+# bash completion for mysqladmin                           -*- shell-script -*-
 
 _mysqladmin()
 {
@@ -52,10 +52,4 @@ _mysqladmin()
 } &&
 complete -F _mysqladmin mysqladmin
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ncftp b/completions/ncftp
index 58c7b7fc..57347e0e 100644
--- a/completions/ncftp
+++ b/completions/ncftp
@@ -1,4 +1,4 @@
-# bash completion for ncftp
+# bash completion for ncftp                                -*- shell-script -*-
 
 _ncftp()
 {
@@ -14,10 +14,4 @@ _ncftp()
 } &&
 complete -F _ncftp -o default ncftp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/newgrp b/completions/newgrp
index c3979546..ddcd79e8 100644
--- a/completions/newgrp
+++ b/completions/newgrp
@@ -1,4 +1,4 @@
-# newgrp(1) completion
+# newgrp(1) completion                                     -*- shell-script -*-
 
 _newgrp()
 {
@@ -13,10 +13,4 @@ _newgrp()
 } &&
 complete -F _newgrp newgrp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/newlist b/completions/newlist
index e5da0cfe..9e2f6933 100644
--- a/completions/newlist
+++ b/completions/newlist
@@ -1,4 +1,4 @@
-# mailman newlist completion
+# mailman newlist completion                               -*- shell-script -*-
 
 _newlist()
 {
@@ -14,10 +14,4 @@ _newlist()
 } &&
 complete -F _newlist newlist
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/newusers b/completions/newusers
index 1a102aac..aa1394d2 100644
--- a/completions/newusers
+++ b/completions/newusers
@@ -1,4 +1,4 @@
-# newusers(8) completion
+# newusers(8) completion                                   -*- shell-script -*-
 
 _newusers()
 {
@@ -28,10 +28,4 @@ _newusers()
 } &&
 complete -F _newusers newusers
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/nmap b/completions/nmap
index 4dcbfbc7..89769bfb 100644
--- a/completions/nmap
+++ b/completions/nmap
@@ -1,4 +1,4 @@
-# bash completion for nmap
+# bash completion for nmap                                 -*- shell-script -*-
 
 _nmap()
 {
@@ -47,10 +47,4 @@ _nmap()
 } &&
 complete -F _nmap nmap
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/nslookup b/completions/nslookup
index 787ceeb9..8285ee1a 100644
--- a/completions/nslookup
+++ b/completions/nslookup
@@ -1,4 +1,4 @@
-# bash completion for nslookup
+# bash completion for nslookup                             -*- shell-script -*-
 
 _bind_queryclass()
 {
@@ -72,10 +72,4 @@ _host()
 } &&
 complete -F _host host
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ntpdate b/completions/ntpdate
index fd9db951..e09a2dfb 100644
--- a/completions/ntpdate
+++ b/completions/ntpdate
@@ -1,4 +1,4 @@
-# bash completion for ntpdate
+# bash completion for ntpdate                              -*- shell-script -*-
 
 _ntpdate()
 {
@@ -32,10 +32,4 @@ _ntpdate()
 } &&
 complete -F _ntpdate ntpdate
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/openssl b/completions/openssl
index b3573877..68a13c2a 100644
--- a/completions/openssl
+++ b/completions/openssl
@@ -1,4 +1,4 @@
-# bash completion for openssl
+# bash completion for openssl                              -*- shell-script -*-
 
 _openssl_sections()
 {
@@ -243,10 +243,4 @@ _openssl()
 } &&
 complete -F _openssl -o default openssl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/p4 b/completions/p4
index 40fb6f58..59d1bcd9 100644
--- a/completions/p4
+++ b/completions/p4
@@ -1,4 +1,5 @@
-# Perforce completion by Frank Cusack <frank@google.com>
+# Perforce completion                                      -*- shell-script -*-
+# by Frank Cusack <frank@google.com>
 
 _p4()
 {
@@ -48,10 +49,4 @@ _p4()
 } &&
 complete -F _p4 -o default p4 g4
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pack200 b/completions/pack200
index 49829ebb..6be2dc88 100644
--- a/completions/pack200
+++ b/completions/pack200
@@ -1,4 +1,4 @@
-# pack200(1) completion
+# pack200(1) completion                                    -*- shell-script -*-
 
 _pack200()
 {
@@ -72,10 +72,4 @@ _pack200()
 } &&
 complete -F _pack200 pack200
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/passwd b/completions/passwd
index 66f7773e..e470b8bb 100644
--- a/completions/passwd
+++ b/completions/passwd
@@ -1,4 +1,4 @@
-# passwd(1) completion
+# passwd(1) completion                                     -*- shell-script -*-
 
 _passwd()
 {
@@ -20,10 +20,4 @@ _passwd()
 } &&
 complete -F _passwd passwd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/perl b/completions/perl
index 4ec55a2b..a67c7699 100644
--- a/completions/perl
+++ b/completions/perl
@@ -1,4 +1,4 @@
-# bash completion for perl
+# bash completion for perl                                 -*- shell-script -*-
 
 _perlmodules()
 {
@@ -126,10 +126,4 @@ _perldoc()
 } &&
 complete -F _perldoc -o bashdefault perldoc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pgrep b/completions/pgrep
index 3c329ba2..9e66fb95 100644
--- a/completions/pgrep
+++ b/completions/pgrep
@@ -1,4 +1,4 @@
-# pgrep(1) completion.
+# pgrep(1) completion                                      -*- shell-script -*-
 
 _pgrep()
 {
@@ -35,10 +35,4 @@ complete -F _pgrep pgrep
 # Linux pidof(8) completion.
 [[ $OSTYPE == *linux* ]] && complete -F _pgrep pidof
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pine b/completions/pine
index e37cbd9c..39227625 100644
--- a/completions/pine
+++ b/completions/pine
@@ -1,4 +1,4 @@
-# PINE address-book completion
+# PINE address-book completion                             -*- shell-script -*-
 
 _pineaddr()
 {
@@ -10,10 +10,4 @@ _pineaddr()
 } &&
 complete -F _pineaddr -o default pine alpine
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ping b/completions/ping
index 01cb581a..7b1f77a0 100644
--- a/completions/ping
+++ b/completions/ping
@@ -1,4 +1,4 @@
-# ping(8) completion
+# ping(8) completion                                       -*- shell-script -*-
 
 _ping()
 {
@@ -58,10 +58,4 @@ _ping()
 } &&
 complete -F _ping ping ping6
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pkg-config b/completions/pkg-config
index aa89eed8..0156c0dd 100644
--- a/completions/pkg-config
+++ b/completions/pkg-config
@@ -1,4 +1,4 @@
-# bash completion for pkgconfig
+# bash completion for pkgconfig                            -*- shell-script -*-
 
 _pkg_config()
 {
@@ -29,10 +29,4 @@ _pkg_config()
 } &&
 complete -F _pkg_config pkg-config
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pkg_delete b/completions/pkg_delete
index 40b7cc38..15770acb 100644
--- a/completions/pkg_delete
+++ b/completions/pkg_delete
@@ -1,4 +1,4 @@
-# bash completion for FreeBSD base package management tools
+# bash completion for FreeBSD package management tools     -*- shell-script -*-
 
 [[ $OSTYPE == *freebsd* ]] || return 1
 
@@ -18,10 +18,4 @@ _pkg_delete()
 } &&
 complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pkgtool b/completions/pkgtool
index d9e5815a..f7291dbd 100644
--- a/completions/pkgtool
+++ b/completions/pkgtool
@@ -1,4 +1,4 @@
-# Slackware Linux pkgtool completion
+# Slackware Linux pkgtool completion                       -*- shell-script -*-
 
 _pkgtool()
 {
@@ -33,10 +33,4 @@ _pkgtool()
 } &&
 complete -F _pkgtool pkgtool
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pm-hibernate b/completions/pm-hibernate
index da22ba8b..24b30b17 100644
--- a/completions/pm-hibernate
+++ b/completions/pm-hibernate
@@ -1,4 +1,4 @@
-# bash completion for pm-utils
+# bash completion for pm-utils                             -*- shell-script -*-
 
 _pm_action()
 {
@@ -9,10 +9,4 @@ _pm_action()
 } &&
 complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pm-is-supported b/completions/pm-is-supported
index c883c74b..2ca5a9ec 100644
--- a/completions/pm-is-supported
+++ b/completions/pm-is-supported
@@ -1,4 +1,4 @@
-# pm-is-supported(1) completion
+# pm-is-supported(1) completion                            -*- shell-script -*-
 
 _pm_is_supported()
 {
@@ -10,10 +10,4 @@ _pm_is_supported()
 } &&
 complete -F _pm_is_supported pm-is-supported
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pm-powersave b/completions/pm-powersave
index afa1c85b..1f790dca 100644
--- a/completions/pm-powersave
+++ b/completions/pm-powersave
@@ -1,4 +1,4 @@
-# pm-powersave(8) completion
+# pm-powersave(8) completion                               -*- shell-script -*-
 
 _pm_powersave()
 {
@@ -9,10 +9,4 @@ _pm_powersave()
 } &&
 complete -F _pm_powersave pm-powersave
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/portinstall b/completions/portinstall
index 1ff82f5c..3b30c5b3 100644
--- a/completions/portinstall
+++ b/completions/portinstall
@@ -1,4 +1,4 @@
-# bash completion for FreeBSD portinstall
+# bash completion for FreeBSD portinstall                  -*- shell-script -*-
 
 _portinstall()
 {
@@ -29,10 +29,4 @@ _portinstall()
 } &&
 complete -F _portinstall -o dirnames portinstall
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/portupgrade b/completions/portupgrade
index 9999b265..96e4fb6d 100644
--- a/completions/portupgrade
+++ b/completions/portupgrade
@@ -1,4 +1,4 @@
-# bash completion for FreeBSD portupgrade
+# bash completion for FreeBSD portupgrade                  -*- shell-script -*-
 
 _portupgrade()
 {
@@ -17,10 +17,4 @@ _portupgrade()
 } &&
 complete -F _portupgrade -o dirnames portupgrade
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/postcat b/completions/postcat
index 75033e78..c601cb0c 100644
--- a/completions/postcat
+++ b/completions/postcat
@@ -1,4 +1,4 @@
-# postcat(1) completion
+# postcat(1) completion                                    -*- shell-script -*-
 
 _postcat()
 {
@@ -39,10 +39,4 @@ _postcat()
 } &&
 complete -F _postcat postcat
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/postconf b/completions/postconf
index 4de95e4f..5b998d9e 100644
--- a/completions/postconf
+++ b/completions/postconf
@@ -1,4 +1,4 @@
-# postconf(1) completion
+# postconf(1) completion                                   -*- shell-script -*-
 
 _postconf()
 {
@@ -38,10 +38,4 @@ _postconf()
 } &&
 complete -F _postconf postconf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/postfix b/completions/postfix
index 5743b7a2..7eefccbb 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -1,4 +1,4 @@
-# postfix(1) completion
+# postfix(1) completion                                    -*- shell-script -*-
 
 _postfix()
 {
@@ -26,10 +26,4 @@ _postfix()
 } &&
 complete -F _postfix postfix
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/postmap b/completions/postmap
index ac59711d..001db9b5 100644
--- a/completions/postmap
+++ b/completions/postmap
@@ -1,4 +1,4 @@
-# postalias(1) and postmap(1) completion
+# postalias(1) and postmap(1) completion                   -*- shell-script -*-
 
 _postmap()
 {
@@ -40,10 +40,4 @@ _postmap()
 } &&
 complete -F _postmap postmap postalias
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/postsuper b/completions/postsuper
index cfa867c6..25bc916f 100644
--- a/completions/postsuper
+++ b/completions/postsuper
@@ -1,4 +1,4 @@
-# postsuper(1) completion
+# postsuper(1) completion                                  -*- shell-script -*-
 
 _postsuper()
 {
@@ -59,10 +59,4 @@ _postsuper()
 } &&
 complete -F _postsuper postsuper
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/povray b/completions/povray
index 0a853550..e5ef9df6 100644
--- a/completions/povray
+++ b/completions/povray
@@ -1,4 +1,5 @@
-# povray completion by "David Necas (Yeti)" <yeti@physics.muni.cz>
+# povray completion                                        -*- shell-script -*-
+# by "David Necas (Yeti)" <yeti@physics.muni.cz>
 
 _povray()
 {
@@ -54,10 +55,4 @@ _povray()
 } &&
 complete -F _povray povray xpovray spovray
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/prelink b/completions/prelink
index ade3258d..f84261d1 100644
--- a/completions/prelink
+++ b/completions/prelink
@@ -1,3 +1,5 @@
+# prelink(8) completion                                    -*- shell-script -*-
+
 _prelink()
 {
     local cur prev words cword split
@@ -37,10 +39,4 @@ _prelink()
 } &&
 complete -F _prelink prelink
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/protoc b/completions/protoc
index 2ebae940..4621cf64 100644
--- a/completions/protoc
+++ b/completions/protoc
@@ -1,3 +1,5 @@
+# protoc completion                                        -*- shell-script -*-
+
 _protoc()
 {
     local cur prev words cword split
@@ -58,10 +60,4 @@ _protoc()
 } &&
 complete -F _protoc protoc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/psql b/completions/psql
index 6aeaf50c..7e4276bc 100644
--- a/completions/psql
+++ b/completions/psql
@@ -1,4 +1,4 @@
-# bash completion for Postgresql
+# bash completion for Postgresql                           -*- shell-script -*-
 
 _pg_databases()
 {
@@ -134,10 +134,4 @@ _psql()
 } &&
 complete -F _psql psql
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/puppet b/completions/puppet
index 489a85d9..776c8492 100644
--- a/completions/puppet
+++ b/completions/puppet
@@ -1,4 +1,4 @@
-# bash completion for puppet
+# bash completion for puppet                               -*- shell-script -*-
 
 _puppet_logdest()
 {
@@ -307,10 +307,4 @@ _puppet()
 } &&
 complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet 
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pwck b/completions/pwck
index 478f5f9b..0ed0debc 100644
--- a/completions/pwck
+++ b/completions/pwck
@@ -1,4 +1,4 @@
-# pwck(8) completion
+# pwck(8) completion                                       -*- shell-script -*-
 
 _pwck()
 {
@@ -14,10 +14,4 @@ _pwck()
 } &&
 complete -F _pwck pwck
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pwdx b/completions/pwdx
index d5186711..e91d9bf4 100644
--- a/completions/pwdx
+++ b/completions/pwdx
@@ -1,4 +1,4 @@
-# pwdx(1) completion
+# pwdx(1) completion                                       -*- shell-script -*-
 
 _pwdx()
 {
@@ -15,10 +15,4 @@ _pwdx()
 } &&
 complete -F _pwdx pwdx
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pwgen b/completions/pwgen
index 29bfb442..3aa39a5c 100644
--- a/completions/pwgen
+++ b/completions/pwgen
@@ -1,3 +1,5 @@
+# pwgen(1) completion                                      -*- shell-script -*-
+
 _pwgen()
 {
     local cur prev words cword split
@@ -23,10 +25,4 @@ _pwgen()
 } &&
 complete -F _pwgen pwgen
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/python b/completions/python
index 86285f43..969f3b93 100644
--- a/completions/python
+++ b/completions/python
@@ -1,4 +1,4 @@
-# bash completion for python
+# bash completion for python                               -*- shell-script -*-
 
 _python()
 {
@@ -44,10 +44,4 @@ _python()
 } &&
 complete -F _python python python2 python3
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/qdbus b/completions/qdbus
index e4fa968e..5ed6bf89 100644
--- a/completions/qdbus
+++ b/completions/qdbus
@@ -1,4 +1,4 @@
-# Qt qdbus, dcop completion
+# Qt qdbus, dcop completion                                -*- shell-script -*-
 
 _qdbus()
 {
@@ -11,10 +11,4 @@ _qdbus()
 } &&
 complete -F _qdbus qdbus dcop
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/qemu b/completions/qemu
index 320c3010..45a48b9b 100644
--- a/completions/qemu
+++ b/completions/qemu
@@ -1,4 +1,4 @@
-# bash completion for qemu
+# bash completion for qemu                                 -*- shell-script -*-
 
 _qemu()
 {
@@ -108,10 +108,4 @@ _qemu()
 } &&
 complete -F _qemu qemu
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/qrunner b/completions/qrunner
index 1427a826..3fe5f810 100644
--- a/completions/qrunner
+++ b/completions/qrunner
@@ -1,4 +1,4 @@
-# mailman qrunner completion
+# mailman qrunner completion                               -*- shell-script -*-
 
 _qrunner()
 {
@@ -15,10 +15,4 @@ _qrunner()
 } &&
 complete -F _qrunner qrunner
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/querybts b/completions/querybts
index 1f2c971d..a973f743 100644
--- a/completions/querybts
+++ b/completions/querybts
@@ -1,4 +1,4 @@
-# querybts completion
+# querybts completion                                      -*- shell-script -*-
 
 _querybts()
 {
@@ -32,10 +32,4 @@ _querybts()
 } &&
 complete -F _querybts querybts
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/quota b/completions/quota
index b95c386a..626a3802 100644
--- a/completions/quota
+++ b/completions/quota
@@ -1,4 +1,4 @@
-# bash completion for quota-tools
+# bash completion for quota-tools                          -*- shell-script -*-
 
 _user_or_group()
 {
@@ -189,10 +189,4 @@ _quotaon()
 } &&
 complete -F _quotaon -o default quotaon quotaoff
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rcs b/completions/rcs
index f29d2e46..a8eac85b 100644
--- a/completions/rcs
+++ b/completions/rcs
@@ -1,4 +1,4 @@
-# bash completion for rcs
+# bash completion for rcs                                  -*- shell-script -*-
 
 _rcs()
 {
@@ -33,10 +33,4 @@ _rcs()
 } &&
 complete -F _rcs ci co rlog rcs rcsdiff
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rdesktop b/completions/rdesktop
index b4b14dd9..48a91750 100644
--- a/completions/rdesktop
+++ b/completions/rdesktop
@@ -1,4 +1,4 @@
-# bash completion for rdesktop
+# bash completion for rdesktop                             -*- shell-script -*-
 
 _rdesktop()
 {
@@ -54,10 +54,4 @@ _rdesktop()
 } &&
 complete -F _rdesktop rdesktop
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/remove_members b/completions/remove_members
index f0622058..4e459381 100644
--- a/completions/remove_members
+++ b/completions/remove_members
@@ -1,4 +1,4 @@
-# mailman remove_members completion
+# mailman remove_members completion                        -*- shell-script -*-
 
 _remove_members()
 {
@@ -24,10 +24,4 @@ _remove_members()
 } &&
 complete -F _remove_members remove_members
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/removepkg b/completions/removepkg
index 0152bfc3..5b3d8273 100644
--- a/completions/removepkg
+++ b/completions/removepkg
@@ -1,4 +1,4 @@
-# Slackware Linux removepkg completion
+# Slackware Linux removepkg completion                     -*- shell-script -*-
 
 _removepkg()
 {
@@ -16,10 +16,4 @@ _removepkg()
 } &&
 complete -F _removepkg removepkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/renice b/completions/renice
index d335b3f5..60968eef 100644
--- a/completions/renice
+++ b/completions/renice
@@ -1,4 +1,4 @@
-# renice(8) completion
+# renice(8) completion                                     -*- shell-script -*-
 
 _renice()
 {
@@ -26,10 +26,4 @@ _renice()
 } &&
 complete -F _renice renice
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/reportbug b/completions/reportbug
index f2bfece7..aa5ac3e5 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -1,4 +1,4 @@
-# bash completion for (Debian) reportbug
+# bash completion for (Debian) reportbug                   -*- shell-script -*-
 
 _reportbug()
 {
@@ -83,10 +83,4 @@ _reportbug()
 } &&
 complete -F _reportbug reportbug
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/reptyr b/completions/reptyr
index 1bc4a447..3097daa9 100644
--- a/completions/reptyr
+++ b/completions/reptyr
@@ -1,4 +1,4 @@
-# bash completion for reptyr(1)
+# bash completion for reptyr(1)                            -*- shell-script -*-
 
 _reptyr()
 {
@@ -20,10 +20,4 @@ _reptyr()
 } &&
 complete -F _reptyr reptyr
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/resolvconf b/completions/resolvconf
index 682d79ba..c2f1b42b 100644
--- a/completions/resolvconf
+++ b/completions/resolvconf
@@ -1,4 +1,4 @@
-# bash completion for resolvconf
+# bash completion for resolvconf                           -*- shell-script -*-
 
 _resolvconf()
 {
@@ -18,10 +18,4 @@ _resolvconf()
 } &&
 complete -F _resolvconf resolvconf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rfkill b/completions/rfkill
index c03f488a..305f19d1 100644
--- a/completions/rfkill
+++ b/completions/rfkill
@@ -1,4 +1,4 @@
-# bash completion for rfkill
+# bash completion for rfkill                               -*- shell-script -*-
 
 _rfkill()
 {
@@ -25,10 +25,4 @@ _rfkill()
 } &&
 complete -F _rfkill rfkill
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ri b/completions/ri
index 0c02033a..70756325 100644
--- a/completions/ri
+++ b/completions/ri
@@ -1,4 +1,5 @@
-# ri completion for Ruby documentation by Ian Macdonald <ian@caliban.org>
+# ri completion for Ruby documentation                     -*- shell-script -*-
+# by Ian Macdonald <ian@caliban.org>
 
 ri_get_methods()
 {
@@ -85,10 +86,4 @@ _ri()
 } &&
 complete -F _ri ri
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rmlist b/completions/rmlist
index 5f77092d..dd31333c 100644
--- a/completions/rmlist
+++ b/completions/rmlist
@@ -1,4 +1,4 @@
-# mailman rmlist completion
+# mailman rmlist completion                                -*- shell-script -*-
 
 _rmlist()
 {
@@ -14,10 +14,4 @@ _rmlist()
 } &&
 complete -F _rmlist rmlist
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rmmod b/completions/rmmod
index 50dd982c..3b266067 100644
--- a/completions/rmmod
+++ b/completions/rmmod
@@ -1,5 +1,5 @@
-# Linux rmmod(8) completion. This completes on a list of all currently
-# installed kernel modules.
+# Linux rmmod(8) completion.                               -*- shell-script -*-
+# This completes on a list of all currently installed kernel modules.
 
 _rmmod()
 {
@@ -11,10 +11,4 @@ _rmmod()
 } &&
 complete -F _rmmod rmmod
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/route b/completions/route
index 72079e23..14fc2599 100644
--- a/completions/route
+++ b/completions/route
@@ -1,4 +1,4 @@
-# Linux route(8) completion
+# Linux route(8) completion                                -*- shell-script -*-
 
 [[ $OSTYPE == *linux* ]] || return 1
 
@@ -27,10 +27,4 @@ _route()
 } &&
 complete -F _route route
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rpcdebug b/completions/rpcdebug
index 22830b16..6d4acf52 100644
--- a/completions/rpcdebug
+++ b/completions/rpcdebug
@@ -1,4 +1,4 @@
-# bash completion for rpcdebug
+# bash completion for rpcdebug                             -*- shell-script -*-
 
 _rpcdebug_flags()
 {
@@ -44,10 +44,4 @@ _rpcdebug()
 } &&
 complete -F _rpcdebug rpcdebug
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rpm b/completions/rpm
index f6b65e7c..c7e67705 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -1,4 +1,4 @@
-# bash completion for rpm
+# bash completion for rpm                                  -*- shell-script -*-
 
 # helper functions
 
@@ -302,10 +302,4 @@ _rpmbuild()
 } &&
 complete -F _rpmbuild rpmbuild rpmbuild-md5
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rpm2tgz b/completions/rpm2tgz
index 7dc73d7c..0b4510c7 100644
--- a/completions/rpm2tgz
+++ b/completions/rpm2tgz
@@ -1,4 +1,4 @@
-# Slackware rpm2tgz completion.
+# Slackware rpm2tgz completion                             -*- shell-script -*-
 
 _rpm2tgz()
 {
@@ -13,10 +13,4 @@ _rpm2tgz()
     COMPREPLY=( $(compgen -f -X "!*.rpm" -- "$cur") )
 } && complete -F _rpm2tgz -o plusdirs rpm2tgz rpm2txz rpm2targz
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rpmcheck b/completions/rpmcheck
index 8bbc46a3..5c3d16f0 100644
--- a/completions/rpmcheck
+++ b/completions/rpmcheck
@@ -1,4 +1,4 @@
-# bash completion for rpmcheck
+# bash completion for rpmcheck                             -*- shell-script -*-
 
 _rpmcheck()
 {
@@ -21,10 +21,4 @@ _rpmcheck()
 } &&
 complete -F _rpmcheck rpmcheck
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rrdtool b/completions/rrdtool
index 909d2f4d..9280d8f5 100644
--- a/completions/rrdtool
+++ b/completions/rrdtool
@@ -1,4 +1,4 @@
-# bash completion for rrdtool
+# bash completion for rrdtool                              -*- shell-script -*-
 
 _rrdtool ()
 {
@@ -14,10 +14,4 @@ _rrdtool ()
 } &&
 complete -F _rrdtool rrdtool
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rsync b/completions/rsync
index aec6ea3c..e8b75b1a 100644
--- a/completions/rsync
+++ b/completions/rsync
@@ -1,4 +1,4 @@
-# bash completion for rsync
+# bash completion for rsync                                -*- shell-script -*-
 
 _rsync()
 {
@@ -86,10 +86,4 @@ _rsync()
 } &&
 complete -F _rsync -o nospace rsync
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/rtcwake b/completions/rtcwake
index bc2bbf39..f276c1be 100644
--- a/completions/rtcwake
+++ b/completions/rtcwake
@@ -1,4 +1,4 @@
-# bash completion for rtcwake
+# bash completion for rtcwake                              -*- shell-script -*-
 
 _rtcwake()
 {
@@ -26,10 +26,4 @@ _rtcwake()
 } &&
 complete -F _rtcwake rtcwake
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sbcl b/completions/sbcl
index 13282696..28cb9d80 100644
--- a/completions/sbcl
+++ b/completions/sbcl
@@ -1,3 +1,4 @@
+#                                                          -*- shell-script -*-
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -19,10 +20,4 @@ _sbcl()
 } &&
 complete -F _sbcl sbcl sbcl-mt
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sbopkg b/completions/sbopkg
index d31d73b1..647355b0 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -1,4 +1,4 @@
-# bash completion for sbopkg tool
+# bash completion for sbopkg tool                          -*- shell-script -*-
 
 _sbopkg()
 {
@@ -71,10 +71,4 @@ _sbopkg()
         $( cd $QUEUEDIR; compgen -f -X "!*.sqf"  -- "$cur" ) )
 } && complete -F _sbopkg sbopkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/screen b/completions/screen
index 00e93f15..7132d064 100644
--- a/completions/screen
+++ b/completions/screen
@@ -1,4 +1,4 @@
-# bash completion for screen
+# bash completion for screen                               -*- shell-script -*-
 
 _screen_sessions()
 {
@@ -91,10 +91,4 @@ _screen()
 } &&
 complete -F _screen screen
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/service b/completions/service
index 51257ab0..f008770e 100644
--- a/completions/service
+++ b/completions/service
@@ -1,4 +1,4 @@
-# service(8) and /etc/init.d/* completion
+# service(8) and /etc/init.d/* completion                  -*- shell-script -*-
 
 # This completes on a list of all available service scripts for the
 # 'service' command and/or the SysV init.d directory, followed by
@@ -31,10 +31,4 @@ for svc in /etc/init.d/!($_backup_glob) /etc/rc.d/init.d/!($_backup_glob); do
 done
 unset svc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sh b/completions/sh
index 4728236d..b70e53e2 100644
--- a/completions/sh
+++ b/completions/sh
@@ -1,4 +1,4 @@
-# POSIX sh(1) completion
+# POSIX sh(1) completion                                   -*- shell-script -*-
 
 _sh()
 {
@@ -30,10 +30,4 @@ _sh()
 } &&
 complete -F _sh sh
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sitecopy b/completions/sitecopy
index c12b3609..1f18514a 100644
--- a/completions/sitecopy
+++ b/completions/sitecopy
@@ -1,4 +1,4 @@
-# sitecopy(1) completion
+# sitecopy(1) completion                                   -*- shell-script -*-
 # Copyright 2003 Eelco Lempsink <eelcolempsink@gmx.net>
 #           2011 Raphaël Droz <raphael.droz+floss@gmail.com>
 # License: GNU GPL v2 or later
@@ -48,10 +48,4 @@ _sitecopy()
 } &&
 complete -F _sitecopy -o default sitecopy
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/slackpkg b/completions/slackpkg
index 399563c0..1d5759cb 100644
--- a/completions/slackpkg
+++ b/completions/slackpkg
@@ -1,4 +1,4 @@
-# bash completion for slackpkg tool
+# bash completion for slackpkg tool                        -*- shell-script -*-
 # options list is based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)`
 
 _slackpkg()
@@ -105,10 +105,4 @@ _slackpkg()
 
 } && complete -F _slackpkg slackpkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/slapt-get b/completions/slapt-get
index f6d9f35a..99b50384 100644
--- a/completions/slapt-get
+++ b/completions/slapt-get
@@ -1,4 +1,4 @@
-# slapt-get completion
+# slapt-get completion                                     -*- shell-script -*-
 
 _slapt_get()
 {
@@ -78,10 +78,4 @@ _slapt_get()
     esac
 } && complete -F _slapt_get slapt-get
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/slapt-src b/completions/slapt-src
index 305879f9..976ef65e 100644
--- a/completions/slapt-src
+++ b/completions/slapt-src
@@ -1,4 +1,4 @@
-# slapt-src completion
+# slapt-src completion                                     -*- shell-script -*-
 
 _slapt_src()
 {
@@ -57,10 +57,4 @@ _slapt_src()
     fi
 } && complete -F _slapt_src slapt-src
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/smartctl b/completions/smartctl
index 61ec7d66..8461c988 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -1,4 +1,4 @@
-# bash completion for smartctl(8)
+# bash completion for smartctl(8)                          -*- shell-script -*-
 
 _smartctl_quietmode()
 {
@@ -165,10 +165,4 @@ _smartctl()
 } &&
 complete -F _smartctl smartctl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/smbclient b/completions/smbclient
index 3f45ea79..ceda7bbf 100644
--- a/completions/smbclient
+++ b/completions/smbclient
@@ -1,4 +1,4 @@
-# bash completion for samba
+# bash completion for samba                                -*- shell-script -*-
 
 _samba_resolve_order()
 {
@@ -320,10 +320,4 @@ _smbtree()
 } &&
 complete -F _smbtree smbtree
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/snownews b/completions/snownews
index 3ba2dc79..0cb35cdc 100644
--- a/completions/snownews
+++ b/completions/snownews
@@ -1,4 +1,4 @@
-# snownews(1) completion
+# snownews(1) completion                                   -*- shell-script -*-
 
 _snownews()
 {
@@ -12,10 +12,4 @@ _snownews()
 } &&
 complete -F _snownews snownews
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sqlite3 b/completions/sqlite3
index e65e27d0..1207823d 100644
--- a/completions/sqlite3
+++ b/completions/sqlite3
@@ -1,4 +1,4 @@
-# sqlite3(1) completion
+# sqlite3(1) completion                                    -*- shell-script -*-
 
 _sqlite3()
 {
@@ -28,10 +28,4 @@ _sqlite3()
 } &&
 complete -F _sqlite3 sqlite3
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ssh b/completions/ssh
index eae47b26..e30b9153 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -1,4 +1,4 @@
-# ssh(1) completion
+# ssh(1) completion                                        -*- shell-script -*-
 
 _ssh_ciphers()
 {
@@ -385,10 +385,4 @@ _scp()
 } &&
 complete -F _scp -o nospace scp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id
index 46829190..9c5af9ca 100644
--- a/completions/ssh-copy-id
+++ b/completions/ssh-copy-id
@@ -1,4 +1,4 @@
-# ssh-copy-id(1) completion
+# ssh-copy-id(1) completion                                -*- shell-script -*-
 
 _ssh_copy_id()
 {
@@ -22,10 +22,4 @@ _ssh_copy_id()
 } &&
 complete -F _ssh_copy_id ssh-copy-id
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sshfs b/completions/sshfs
index 180647ee..90a92645 100644
--- a/completions/sshfs
+++ b/completions/sshfs
@@ -1,4 +1,4 @@
-# sshfs(1) completion
+# sshfs(1) completion                                      -*- shell-script -*-
 
 _sshfs()
 {
@@ -24,10 +24,4 @@ _sshfs()
 } &&
 complete -F _sshfs -o nospace sshfs
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sshmitm b/completions/sshmitm
index 22609826..829bfcd5 100644
--- a/completions/sshmitm
+++ b/completions/sshmitm
@@ -1,4 +1,4 @@
-# sshmitm completion
+# sshmitm completion                                       -*- shell-script -*-
 
 _sshmitm()
 {
@@ -14,10 +14,4 @@ _sshmitm()
 } &&
 complete -F _sshmitm sshmitm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sshow b/completions/sshow
index fad595d7..a28d2444 100644
--- a/completions/sshow
+++ b/completions/sshow
@@ -1,4 +1,4 @@
-# sshow completion
+# sshow completion                                         -*- shell-script -*-
 
 _sshow()
 {
@@ -19,10 +19,4 @@ _sshow()
 } &&
 complete -F _sshow sshow
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/strace b/completions/strace
index 18ca69ef..0ac4163a 100644
--- a/completions/strace
+++ b/completions/strace
@@ -1,4 +1,4 @@
-# bash completion for strace
+# bash completion for strace                               -*- shell-script -*-
 
 _strace()
 {
@@ -99,10 +99,4 @@ _strace()
 } &&
 complete -F _strace -o default strace
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/svk b/completions/svk
index bccc1689..1146277d 100644
--- a/completions/svk
+++ b/completions/svk
@@ -1,4 +1,4 @@
-# svk(1) completion
+# svk(1) completion                                        -*- shell-script -*-
 
 _svk()
 {
@@ -215,10 +215,4 @@ _svk()
 } &&
 complete -F _svk svk
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sync_members b/completions/sync_members
index ba23267a..77420f16 100644
--- a/completions/sync_members
+++ b/completions/sync_members
@@ -1,4 +1,4 @@
-# mailman sync_members completion
+# mailman sync_members completion                          -*- shell-script -*-
 
 _sync_members()
 {
@@ -28,10 +28,4 @@ _sync_members()
 } &&
 complete -F _sync_members sync_members
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sysbench b/completions/sysbench
index 854f4cb5..e3d666cb 100644
--- a/completions/sysbench
+++ b/completions/sysbench
@@ -1,4 +1,4 @@
-# bash completion for sysbench
+# bash completion for sysbench                             -*- shell-script -*-
 
 _sysbench()
 {
@@ -130,10 +130,4 @@ _sysbench()
 } &&
 complete -F _sysbench sysbench
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/sysctl b/completions/sysctl
index b6e1a278..0ab37129 100644
--- a/completions/sysctl
+++ b/completions/sysctl
@@ -1,4 +1,4 @@
-# bash completion for sysctl
+# bash completion for sysctl                               -*- shell-script -*-
 
 _sysctl()
 {
@@ -26,10 +26,4 @@ _sysctl()
 } &&
 complete -F _sysctl sysctl
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/tar b/completions/tar
index 8ea292e0..9d1c56a4 100644
--- a/completions/tar
+++ b/completions/tar
@@ -1,4 +1,4 @@
-# bash completion for GNU tar
+# bash completion for GNU tar                              -*- shell-script -*-
 
 _tar()
 {
@@ -129,10 +129,4 @@ _tar()
 [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ] && complete -F _tar -o dirnames tar ||
     complete -F _tar tar
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/tcpdump b/completions/tcpdump
index 802835e1..8fe4ed63 100644
--- a/completions/tcpdump
+++ b/completions/tcpdump
@@ -1,4 +1,4 @@
-# bash completion for tcpdump
+# bash completion for tcpdump                              -*- shell-script -*-
 
 _tcpdump()
 {
@@ -43,10 +43,4 @@ _tcpdump()
 } &&
 complete -F _tcpdump tcpdump
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/tcpkill b/completions/tcpkill
index a9680d29..82420230 100644
--- a/completions/tcpkill
+++ b/completions/tcpkill
@@ -1,4 +1,4 @@
-# tcpkill completion
+# tcpkill completion                                       -*- shell-script -*-
 
 _tcpkill()
 {
@@ -19,10 +19,4 @@ _tcpkill()
 } &&
 complete -F _tcpkill tcpkill
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/tcpnice b/completions/tcpnice
index ea069a6c..03c23e5e 100644
--- a/completions/tcpnice
+++ b/completions/tcpnice
@@ -1,4 +1,4 @@
-# tcpnice completion
+# tcpnice completion                                       -*- shell-script -*-
 
 _tcpnice()
 {
@@ -19,10 +19,4 @@ _tcpnice()
 } &&
 complete -F _tcpnice tcpnice
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/tracepath b/completions/tracepath
index 9b45534a..1861b6a2 100644
--- a/completions/tracepath
+++ b/completions/tracepath
@@ -1,4 +1,4 @@
-# tracepath(8) completion
+# tracepath(8) completion                                  -*- shell-script -*-
 
 _tracepath()
 {
@@ -20,10 +20,4 @@ _tracepath()
 } &&
 complete -F _tracepath tracepath tracepath6
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/tune2fs b/completions/tune2fs
index c23548f1..ee88b45d 100644
--- a/completions/tune2fs
+++ b/completions/tune2fs
@@ -1,4 +1,4 @@
-# tune2fs(8) completion
+# tune2fs(8) completion                                    -*- shell-script -*-
 
 _tune2fs()
 {
@@ -55,10 +55,4 @@ _tune2fs()
 } &&
 complete -F _tune2fs tune2fs
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/unace b/completions/unace
index 0b93a3da..4ce5e370 100644
--- a/completions/unace
+++ b/completions/unace
@@ -1,4 +1,4 @@
-# unace(1) completion
+# unace(1) completion                                      -*- shell-script -*-
 
 _unace()
 {
@@ -17,10 +17,4 @@ _unace()
 } &&
 complete -F _unace unace
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/unpack200 b/completions/unpack200
index 208ad471..de708fe8 100644
--- a/completions/unpack200
+++ b/completions/unpack200
@@ -1,4 +1,4 @@
-# unpack200(1) completion
+# unpack200(1) completion                                  -*- shell-script -*-
 
 _unpack200()
 {
@@ -45,10 +45,4 @@ _unpack200()
 } &&
 complete -F _unpack200 unpack200
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/unrar b/completions/unrar
index 917cb2e5..d99e62fe 100644
--- a/completions/unrar
+++ b/completions/unrar
@@ -1,4 +1,4 @@
-# unrar(1) completion
+# unrar(1) completion                                      -*- shell-script -*-
 
 _unrar()
 {
@@ -20,10 +20,4 @@ _unrar()
 } &&
 complete -F _unrar unrar
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/unshunt b/completions/unshunt
index 422e5045..6e208d0c 100644
--- a/completions/unshunt
+++ b/completions/unshunt
@@ -1,4 +1,4 @@
-# mailman unshunt completion
+# mailman unshunt completion                               -*- shell-script -*-
 
 _unshunt()
 {
@@ -14,10 +14,4 @@ _unshunt()
 } &&
 complete -F _unshunt unshunt
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/update-alternatives b/completions/update-alternatives
index 1e9b7686..523e1de5 100644
--- a/completions/update-alternatives
+++ b/completions/update-alternatives
@@ -1,4 +1,4 @@
-# bash completion for update-alternatives
+# bash completion for update-alternatives                  -*- shell-script -*-
 
 _installed_alternatives()
 {
@@ -89,10 +89,4 @@ _update_alternatives()
 } &&
 complete -F _update_alternatives update-alternatives alternatives
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/update-rc.d b/completions/update-rc.d
index 92e29eb2..b1d21e86 100644
--- a/completions/update-rc.d
+++ b/completions/update-rc.d
@@ -1,4 +1,4 @@
-# update-rc.d(8) completion
+# update-rc.d(8) completion                                -*- shell-script -*-
 #
 # Copyright (C) 2004 Servilio Afre Puentes <servilio@gmail.com>
 
@@ -62,10 +62,4 @@ _update_rc_d()
 } &&
 complete -F _update_rc_d update-rc.d
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/upgradepkg b/completions/upgradepkg
index e4a7d8ad..06dbe571 100644
--- a/completions/upgradepkg
+++ b/completions/upgradepkg
@@ -1,4 +1,4 @@
-# Slackware Linux upgradepkg completion
+# Slackware Linux upgradepkg completion                    -*- shell-script -*-
 
 _upgradepkg()
 {
@@ -14,10 +14,4 @@ _upgradepkg()
     _filedir "t[bglx]z"
 } && complete -F _upgradepkg upgradepkg
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/urlsnarf b/completions/urlsnarf
index 172e789a..bb1a29ef 100644
--- a/completions/urlsnarf
+++ b/completions/urlsnarf
@@ -1,4 +1,4 @@
-# urlsnarf completion
+# urlsnarf completion                                      -*- shell-script -*-
 
 _urlsnarf()
 {
@@ -19,10 +19,4 @@ _urlsnarf()
 } &&
 complete -F _urlsnarf urlsnarf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/useradd b/completions/useradd
index 6b2be57a..2a61c948 100644
--- a/completions/useradd
+++ b/completions/useradd
@@ -1,4 +1,4 @@
-# useradd(8) completion
+# useradd(8) completion                                    -*- shell-script -*-
 
 _useradd()
 {
@@ -42,10 +42,4 @@ _useradd()
 } &&
 complete -F _useradd useradd
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/userdel b/completions/userdel
index 08939b25..aafd00eb 100644
--- a/completions/userdel
+++ b/completions/userdel
@@ -1,4 +1,4 @@
-# userdel(8) completion
+# userdel(8) completion                                    -*- shell-script -*-
 
 _userdel()
 {
@@ -14,10 +14,4 @@ _userdel()
 } &&
 complete -F _userdel userdel
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/usermod b/completions/usermod
index 18e363a0..f8cd9e0e 100644
--- a/completions/usermod
+++ b/completions/usermod
@@ -1,4 +1,4 @@
-# usermod(8) completion
+# usermod(8) completion                                    -*- shell-script -*-
 
 _usermod()
 {
@@ -41,10 +41,4 @@ _usermod()
 } &&
 complete -F _usermod usermod
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/vipw b/completions/vipw
index ac885aa7..4205cee2 100644
--- a/completions/vipw
+++ b/completions/vipw
@@ -1,4 +1,4 @@
-# vipw(8) and vigr completion
+# vipw(8) and vigr completion                              -*- shell-script -*-
 
 _vipw()
 {
@@ -18,10 +18,4 @@ _vipw()
 } &&
 complete -F _vipw vipw vigr
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/vncviewer b/completions/vncviewer
index 2cabfd9b..46d6c617 100644
--- a/completions/vncviewer
+++ b/completions/vncviewer
@@ -1,4 +1,4 @@
-# bash completion for vncviewer
+# bash completion for vncviewer                            -*- shell-script -*-
 
 _vncviewer_bootstrap()
 {
@@ -104,10 +104,4 @@ _xvnc4viewer()
 } &&
 complete -F _xvnc4viewer xvnc4viewer
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/vpnc b/completions/vpnc
index 511d0251..0465c31e 100644
--- a/completions/vpnc
+++ b/completions/vpnc
@@ -1,4 +1,4 @@
-# bash completion for vpnc
+# bash completion for vpnc                                 -*- shell-script -*-
 
 _vpnc()
 {
@@ -37,10 +37,4 @@ _vpnc()
 } &&
 complete -F _vpnc vpnc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/watch b/completions/watch
index 025a47b2..c2832dd8 100644
--- a/completions/watch
+++ b/completions/watch
@@ -1,4 +1,4 @@
-# watch(1) completion
+# watch(1) completion                                      -*- shell-script -*-
 
 [[ $OSTYPE == *linux* ]] || return 1
 
@@ -51,10 +51,4 @@ _watch()
 } &&
 complete -F _watch watch
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/webmitm b/completions/webmitm
index cf181f87..68440631 100644
--- a/completions/webmitm
+++ b/completions/webmitm
@@ -1,4 +1,4 @@
-# webmitm completion
+# webmitm completion                                       -*- shell-script -*-
 
 _webmitm()
 {
@@ -14,10 +14,4 @@ _webmitm()
 } &&
 complete -F _webmitm webmitm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/withlist b/completions/withlist
index 167d6533..a48d7ea5 100644
--- a/completions/withlist
+++ b/completions/withlist
@@ -1,4 +1,4 @@
-# mailman withlist completion
+# mailman withlist completion                              -*- shell-script -*-
 
 _withlist()
 {
@@ -15,10 +15,4 @@ _withlist()
 } &&
 complete -F _withlist withlist
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/wodim b/completions/wodim
index 8c762f95..3bc304d1 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -1,4 +1,4 @@
-# bash completion for cdrecord/wodim
+# bash completion for cdrecord/wodim                       -*- shell-script -*-
 
 _cdrecord()
 {
@@ -92,10 +92,4 @@ _cdrecord()
 } &&
 complete -F _cdrecord cdrecord wodim
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/wol b/completions/wol
index 8a6a3a60..02030aba 100644
--- a/completions/wol
+++ b/completions/wol
@@ -1,4 +1,4 @@
-# wol(1) completion
+# wol(1) completion                                        -*- shell-script -*-
 
 _wol()
 {
@@ -35,10 +35,4 @@ _wol()
 } &&
 complete -F _wol wol
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/wtf b/completions/wtf
index 58b422dd..b176d09b 100644
--- a/completions/wtf
+++ b/completions/wtf
@@ -1,4 +1,4 @@
-# wtf completion
+# wtf completion                                           -*- shell-script -*-
 # Raphael Droz, 25/09/2009
 
 _wtf()
@@ -24,10 +24,4 @@ _wtf()
 } &&
 complete -F _wtf wtf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/wvdial b/completions/wvdial
index e2f73b78..da2dbfb3 100644
--- a/completions/wvdial
+++ b/completions/wvdial
@@ -1,4 +1,4 @@
-# bash completion for wvdial
+# bash completion for wvdial                               -*- shell-script -*-
 
 _wvdial()
 {
@@ -43,10 +43,4 @@ _wvdial()
 } &&
 complete -F _wvdial wvdial
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xfreerdp b/completions/xfreerdp
index bb24dbfd..0dfb8537 100644
--- a/completions/xfreerdp
+++ b/completions/xfreerdp
@@ -1,4 +1,4 @@
-# xfreerdp completion
+# xfreerdp completion                                      -*- shell-script -*-
 
 _xfreerdp()
 {
@@ -35,10 +35,4 @@ _xfreerdp()
 } &&
 complete -F _xfreerdp xfreerdp
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xgamma b/completions/xgamma
index 164a5de4..4c434cfe 100644
--- a/completions/xgamma
+++ b/completions/xgamma
@@ -1,4 +1,4 @@
-# bash completion for xgamma(1)
+# bash completion for xgamma(1)                            -*- shell-script -*-
 
 _xgamma()
 {
@@ -54,10 +54,4 @@ _xgamma()
     fi
 } && complete -F _xgamma xgamma
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xhost b/completions/xhost
index 8a529740..397ca9ce 100644
--- a/completions/xhost
+++ b/completions/xhost
@@ -1,4 +1,4 @@
-# xhost(1) completion
+# xhost(1) completion                                      -*- shell-script -*-
 
 _xhost ()
 {
@@ -15,10 +15,4 @@ _xhost ()
 } &&
 complete -F _xhost xhost
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xm b/completions/xm
index 0cc6e783..37bd3d02 100644
--- a/completions/xm
+++ b/completions/xm
@@ -1,4 +1,4 @@
-# bash completion for xm
+# bash completion for xm                                   -*- shell-script -*-
 
 _xen_domain_names()
 {
@@ -222,10 +222,4 @@ _xm()
 } &&
 complete -F _xm xm
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xmllint b/completions/xmllint
index b87ab33d..c29c52d8 100644
--- a/completions/xmllint
+++ b/completions/xmllint
@@ -1,4 +1,4 @@
-# bash completion for xmllint(1)
+# bash completion for xmllint(1)                           -*- shell-script -*-
 
 _xmllint()
 {
@@ -42,10 +42,4 @@ _xmllint()
 } &&
 complete -F _xmllint xmllint
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xmlwf b/completions/xmlwf
index 9b07c2b0..6b7ad1ba 100644
--- a/completions/xmlwf
+++ b/completions/xmlwf
@@ -1,4 +1,4 @@
-# bash completion for xmlwf(1)
+# bash completion for xmlwf(1)                             -*- shell-script -*-
 
 _xmlwf()
 {
@@ -29,10 +29,4 @@ _xmlwf()
 } &&
 complete -F _xmlwf xmlwf
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xmms b/completions/xmms
index 697c9da3..7d849568 100644
--- a/completions/xmms
+++ b/completions/xmms
@@ -1,4 +1,4 @@
-# bash completion for xmms
+# bash completion for xmms                                 -*- shell-script -*-
 
 _xmms()
 {
@@ -24,10 +24,4 @@ _xmms()
 } &&
 complete -F _xmms xmms
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xmodmap b/completions/xmodmap
index b50800d5..243563d3 100644
--- a/completions/xmodmap
+++ b/completions/xmodmap
@@ -1,4 +1,4 @@
-# xmodmap(1) completion
+# xmodmap(1) completion                                    -*- shell-script -*-
 
 _xmodmap()
 {
@@ -21,10 +21,4 @@ _xmodmap()
 } &&
 complete -F _xmodmap xmodmap
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xrandr b/completions/xrandr
index c636304f..36164298 100644
--- a/completions/xrandr
+++ b/completions/xrandr
@@ -1,4 +1,4 @@
-# bash completion for xrandr
+# bash completion for xrandr                               -*- shell-script -*-
 
 _xrandr()
 {
@@ -58,10 +58,4 @@ _xrandr()
 } &&
 complete -F _xrandr xrandr
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xrdb b/completions/xrdb
index 99188802..7a6eefe6 100644
--- a/completions/xrdb
+++ b/completions/xrdb
@@ -1,4 +1,4 @@
-# xrdb(1) completion
+# xrdb(1) completion                                       -*- shell-script -*-
 
 _xrdb()
 {
@@ -24,10 +24,4 @@ _xrdb()
 } &&
 complete -F _xrdb xrdb
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xsltproc b/completions/xsltproc
index 010eb7b5..7c38591f 100644
--- a/completions/xsltproc
+++ b/completions/xsltproc
@@ -1,4 +1,4 @@
-# xsltproc(1) completion
+# xsltproc(1) completion                                   -*- shell-script -*-
 
 _xsltproc()
 {
@@ -46,10 +46,4 @@ _xsltproc()
 } &&
 complete -F _xsltproc xsltproc
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xz b/completions/xz
index 5acf724a..e2e1b709 100644
--- a/completions/xz
+++ b/completions/xz
@@ -1,4 +1,4 @@
-# xz(1) completion
+# xz(1) completion                                         -*- shell-script -*-
 
 _xz()
 {
@@ -52,10 +52,4 @@ _xz()
 } &&
 complete -F _xz xz pxz
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xzdec b/completions/xzdec
index dc7a911b..fc32492e 100644
--- a/completions/xzdec
+++ b/completions/xzdec
@@ -1,4 +1,4 @@
-# xzdec(1) completion
+# xzdec(1) completion                                      -*- shell-script -*-
 
 _xzdec()
 {
@@ -28,10 +28,4 @@ _xzdec()
 } &&
 complete -F _xzdec xzdec
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/ypmatch b/completions/ypmatch
index 1b46e41c..584b0d04 100644
--- a/completions/ypmatch
+++ b/completions/ypmatch
@@ -1,4 +1,4 @@
-# bash completion for yp-tools
+# bash completion for yp-tools                             -*- shell-script -*-
 
 _ypmatch()
 {
@@ -25,10 +25,4 @@ _ypmatch()
 } &&
 complete -F _ypmatch ypmatch ypcat
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/yum-arch b/completions/yum-arch
index f095ae12..8c217373 100644
--- a/completions/yum-arch
+++ b/completions/yum-arch
@@ -1,4 +1,4 @@
-# yum-arch(8) completion
+# yum-arch(8) completion                                   -*- shell-script -*-
 
 _yum_arch()
 {
@@ -13,10 +13,4 @@ _yum_arch()
 } &&
 complete -F _yum_arch yum-arch
 
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
 # ex: ts=4 sw=4 et filetype=sh