Tell *Emacs to indent comments (sh-indent-comment: t).

Also move indentation settings to end of files and expand *Emacs ones to
local variables block to avoid overflowing 80 char lines.

bash_completion

@@ -1,5 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
 #
 #   bash_completion - programmable completion functions for bash 3.x
 #		      (backwards compatible with bash 2.05b)
@@ -1658,3 +1656,11 @@ unset UNAME USERLAND default dirnames filenames have nospace bashdefault \
 
 set $BASH_COMPLETION_ORIGINAL_V_VALUE
 unset BASH_COMPLETION_ORIGINAL_V_VALUE
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/_subversion

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # svn completion
-#
+
 have svn &&
 {
 _svn()
@@ -424,3 +421,11 @@ _svnlook()
 }
 complete -F _svnlook $default svnlook
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/_yum

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # yum(8) completion
-#
+
 have yum && {
 _yum_list()
 {
@@ -178,3 +175,11 @@ _yum_arch()
 	return 0
 } &&
 complete -F _yum_arch $filenames yum-arch
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/ant

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ant
 
 have ant && {
@@ -67,3 +64,11 @@ have complete-ant-cmd.pl && \
      complete -C complete-ant-cmd.pl -F _ant $filenames ant || \
      complete -F _ant $filenames ant
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/apache2ctl

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # apache2ctl(1) completion
-#
+
 have apache2ctl && {
 _apache2ctl() {
 	local APWORDS
@@ -16,3 +13,11 @@ _apache2ctl() {
 }
 complete -F _apache2ctl apache2ctl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/apt

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian apt-get(8) completion.
-#
+
 have apt-get &&
 _apt_get()
 {
@@ -159,3 +156,11 @@ _apt_cache()
 	return 0
 } &&
 complete -F _apt_cache $filenames apt-cache
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/apt-build

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian apt-build(1) completion.
-#
+
 have apt-build &&
 _apt_build()
 {
@@ -66,3 +63,11 @@ _apt_build()
 	return 0
 } &&
 complete -F _apt_build $filenames apt-build
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/aptitude

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian aptitude(1) completion
-#
+
 have aptitude && {
 have grep-status && {
 _comp_dpkg_hold_packages()
@@ -95,3 +92,11 @@ _aptitude()
 }
 complete -F _aptitude $default aptitude
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/aspell

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for aspell
 
 have aspell && {
@@ -91,3 +88,11 @@ _aspell()
 }
 complete -F _aspell $filenames aspell
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/autorpm

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # autorpm(8) completion
-#
+
 have autorpm &&
 _autorpm()
 {
@@ -17,3 +14,11 @@ _autorpm()
 
 } &&
 complete -F _autorpm autorpm
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/bash-builtins

@@ -1,8 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
-# start of section containing completion functions for bash built-ins
-
 # bash alias completion
 #
 _alias()
@@ -129,3 +124,11 @@ _complete()
 	fi
 }
 complete -F _complete complete
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/bind-utils

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for nslookup
 
 have nslookup &&
@@ -17,3 +14,11 @@ _nslookup()
 			       ignoretc' -- "$cur" ) )
 } &&
 complete -F _nslookup nslookup
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/bitkeeper

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
 
 have bk &&
@@ -19,3 +16,11 @@ _bk() {
 	return 0
 } &&
 complete -F _bk bk
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/bittorrent

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # btdownloadheadless(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have btdownloadheadless.py || have btdownloadcurses.py || \
@@ -38,3 +35,11 @@ _btdownload()
 	fi
 } &&
 complete -F _btdownload btdownloadheadless.py btdownloadcurses.py btdownloadgui.py
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/bluez-utils

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for bluez-utils
 
 have hcitool && {
@@ -452,3 +449,11 @@ _avctrl()
 }
 complete -F _avctrl avctrl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/brctl

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for brctl
 
 have brctl &&
@@ -42,3 +39,11 @@ _brctl()
 	esac
 } &&
 complete -F _brctl $default brctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/bzip2

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for bzip2
 
 have bzip2 &&
@@ -40,3 +37,11 @@ _bzip2()
 		    $( compgen -d -- "$cur" ) )
 } &&
 complete -F _bzip2 $filenames bzip2
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cardctl

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Linux cardctl(8) completion
-#
+
 have cardctl &&
 _cardctl()
 {
@@ -18,3 +15,11 @@ _cardctl()
 	fi
 } &&
 complete -F _cardctl cardctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cfengine

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cfengine
 
 have cfagent && {
@@ -87,3 +84,11 @@ _cfrun()
 }
 complete -F _cfrun cfrun
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/chkconfig

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # chkconfig(8) completion
-#
+
 have chkconfig &&
 _chkconfig()
 {
@@ -40,3 +37,11 @@ _chkconfig()
 	fi
 } &&
 complete -F _chkconfig chkconfig
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/chsh

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # chsh(1) completion
-#
+
 _chsh()
 {
 	local cur prev
@@ -20,3 +17,11 @@ _chsh()
 	return 0
 }
 complete -F _chsh chsh
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cksfv

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # cksfv completion by Chris <xris@forevermore.net>
 
 have cksfv &&
@@ -29,3 +26,11 @@ _cksfv()
 	return 0
 } &&
 complete -F _cksfv cksfv
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/clisp

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash brogrammable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -25,3 +22,11 @@ _clisp()
     return 0
 } &&
 complete -F _clisp $default clisp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/configure

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for configure
 
 _configure()
@@ -21,3 +18,11 @@ _configure()
 	fi
 }
 complete -F _configure $default configure
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cowsay

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cowsay
 
 have cowsay &&
@@ -25,3 +22,11 @@ _cowsay()
 
 } &&
 complete -F _cowsay $default cowsay cowthink
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cpan2dist

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cpan2dist
 
 have cpan2dist &&
@@ -43,3 +40,11 @@ _cpan2dist()
 	fi
 } &&
 complete -F _cpan2dist $default cpan2dist
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cpio

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cpio
 
 have cpio && {
@@ -94,3 +91,11 @@ _cpio()
 }
 complete -F _cpio cpio
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cups

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cups
 
 have cancel &&
@@ -14,3 +11,11 @@ _cancel()
 	COMPREPLY=( $( compgen -W "$( lpstat | cut -d' ' -f1 )" -- "$cur" ) )
 } &&
 complete -F _cancel $filenames cancel
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/cvs

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # cvs(1) completion
-#
+
 have cvs && {
 set_prefix()
 {
@@ -265,3 +262,11 @@ _cvs()
 }
 complete -F _cvs $default cvs
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dcop

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for dcop
 
 have dcop &&
@@ -18,3 +15,11 @@ _dcop()
 	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )'  -- "$cur" ) )
 } &&
 complete -F _dcop dcop
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dd

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for dd
 
 have dd &&
@@ -33,3 +30,11 @@ _dd()
 				-S '=' -- "$cur" ) )
 } &&
 complete -F _dd $nospace $filenames dd
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dhclient

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for dhclient
 
 have dhclient && _dhclient()
@@ -30,3 +27,11 @@ have dhclient && _dhclient()
 	fi
 } &&
 complete -F _dhclient dhclient
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dict

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # dict(1) completion
-#
+
 { have dict || have rdict; } && {
 _dictdata()
 {
@@ -71,3 +68,11 @@ _dict()
 }
 complete -F _dict $default dict rdict
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dpkg

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # This function is required by _dpkg() and _dpkg-reconfigure()
 have dpkg && {
 have grep-status && {
@@ -263,3 +260,11 @@ _dpkg_source()
 	esac
 } &&
 complete -F _dpkg_source dpkg-source
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dselect

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian Linux dselect(8) completion.
-#
+
 have dselect &&
 _dselect()
 {
@@ -36,3 +33,11 @@ _dselect()
 	return 0
 } &&
 complete -F _dselect $filenames dselect
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/dsniff

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # dsniff util completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 # arpspoof(8) completion
@@ -281,3 +278,11 @@ _webmitm()
 
 } &&
 complete -F _webmitm webmitm
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/findutils

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # 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.
@@ -114,3 +111,11 @@ _find()
 	return 0
 } &&
 complete -F _find $filenames find
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/freeciv

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # civserver completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have civserver &&
@@ -64,3 +61,11 @@ _civclient()
 
 } &&
 complete -F _civclient civclient
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gcc

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # gcc(1) completion
 #
 # The only unusual feature is that we don't parse "gcc --help -v" output
@@ -10,7 +7,7 @@
 # linker takes a -z option, but you must type -Wl,-z for gcc.)  Instead, we
 # ask the driver ("g++") for the name of the compiler ("cc1"), and parse the
 # --help output of the compiler.
-#
+
 have gcc &&
 _gcc()
 {
@@ -52,3 +49,11 @@ _gcc()
 complete $filenames -F _gcc gcc g++ c++ g77 gcj gpc
 [ $USERLAND = GNU -o $UNAME = Cygwin ] && \
 [ -n "${have:-}" ] && complete $filenames -F _gcc cc
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gcl

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -24,3 +21,11 @@ _gcl()
     return 0
 } &&
 complete -F _gcl $default gcl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gdb

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for gdb
 
 have gdb &&
@@ -37,3 +34,11 @@ _gdb()
 	fi
 } &&
 complete -F _gdb $default gdb
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/genisoimage

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mkisofs/genisoimage
 
 (have mkisofs || have genisoimage) &&
@@ -72,3 +69,11 @@ _mkisofs()
 
 } &&
 complete -F _mkisofs $filenames mkisofs genisoimage
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/getent

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for getent
 
 have getent &&
@@ -50,3 +47,11 @@ _getent()
 	fi
 } &&
 complete -F _getent getent
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gkrellm

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # gkrellm(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have gkrellm || have gkrellm2 &&
@@ -36,3 +33,11 @@ _gkrellm()
 
 } &&
 complete -F _gkrellm gkrellm gkrellm2
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gnatmake

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Gnatmake completion by Ralf_Schroth@t-online.de (Ralf Schroth)
 
 have gnatmake &&
@@ -31,3 +28,11 @@ _gnatmake()
 	fi
 } &&
 complete -F _gnatmake $filenames gnatmake
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gpg

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for gpg
 
 have gpg &&
@@ -38,3 +35,11 @@ _gpg()
 
 } &&
 complete -F _gpg $default gpg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gpg2

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # gpg2(1) completion
-#
+
 have gpg2 && {
 _gpg2 ()
 {
@@ -42,3 +39,11 @@ _gpg2 ()
 } &&
 complete -F _gpg2 $default gpg2
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/gzip

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for gzip
 
 have gzip &&
@@ -42,3 +39,11 @@ _gzip()
 		    $( compgen -d -- "$cur" ) )
 } &&
 complete -F _gzip $filenames gzip
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/harbour

@@ -1,8 +1,13 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # harbour completion by Dave Pearson <davep@davep.org>
 # http://www.harbour-project.org/
 
 complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
 complete -f -X '!*.[Hh][Rr][Bb]' hbrun
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/heimdal

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for heimdal
 
 have ktutil && {
@@ -132,3 +129,11 @@ _ktutil()
 }
 complete -F _ktutil ktutil
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/iconv

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # iconv(1) completion
-#
+
 have iconv &&
 _iconv()
 {
@@ -28,3 +25,11 @@ _iconv()
 	fi
 } &&
 complete -F _iconv $default iconv
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/imagemagick

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ImageMagick
 
 have convert && {
@@ -536,3 +533,11 @@ _stream()
 }
 complete -F _stream $filenames stream
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/info

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for info
 
 have info &&
@@ -51,3 +48,11 @@ _info()
 	return 0
 } &&
 complete -F _info $filenames info
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/ipmitool

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ipmitool
 
 have ipmitool &&
@@ -34,3 +31,11 @@ _ipmitool()
 
 } &&
 complete -F _ipmitool ipmitool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/iptables

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for iptables
 
 have iptables &&
@@ -63,3 +60,11 @@ _iptables()
 
 } &&
 complete -F _iptables iptables
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/isql

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # isql completion by Victor Bogado da Silva Lins <victor@bogado.net>
 
 have isql &&
@@ -12,3 +9,11 @@ _isql()
 	[ -f "$ODBCINI" ] && COMPREPLY=( $( grep \\["$cur" "$ODBCINI" | tr -d \\[\\] ) )
 } &&
 complete -F _isql isql
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/jar

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # jar(1) completion
-#
+
 have jar &&
 _jar()
 {
@@ -29,3 +26,11 @@ _jar()
 	esac
 } &&
 complete -F _jar $filenames jar
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/java

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for java, javac and javadoc
 
 # available path elements completion
@@ -254,3 +251,11 @@ _javac()
 	fi
 } &&
 complete -F _javac $filenames javac
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/kldload

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for FreeBSD kernel module commands
 
 [ $UNAME = FreeBSD ] &&
@@ -31,3 +28,11 @@ _kldunload()
 complete -F _kldunload $filenames kldunload
 
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/larch

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # larch(1) completion by Alex Shinn <foof@synthcode.com>
 
 have larch &&
@@ -38,3 +35,11 @@ notify-library notify-browser push-new-revisions sendmail-mailx' "$cur" ))
 	return 0
 } &&
 complete -F _larch $default larch
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/ldapvi

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ldapvi
 
 have ldapvi &&
@@ -68,3 +65,11 @@ _ldapvi()
 	fi
 } &&
 complete -F _ldapvi ldapvi
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lftp

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for lftp
 
 have lftp &&
@@ -19,3 +16,11 @@ _lftp()
 	return 0
 } &&
 complete -F _lftp $default lftp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lilo

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for lilo(8)
 
 have lilo && {
@@ -55,3 +52,11 @@ _lilo()
 }
 complete -F _lilo lilo
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lilypond

@@ -1,6 +1,11 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # lilypond completion by Laurent Martelli <laurent@bearteam.org>
 
 complete -f -X '!*.ly' lilypond ly2dvi
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/links

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for links
 
 have links &&
@@ -37,3 +34,11 @@ _links()
 	return 0
 } &&
 complete -F _links $filenames links
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lisp

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -25,3 +22,11 @@ _lisp()
     return 0
 } &&
 complete -F _lisp $default lisp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lvm

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for lvm
 
 have lvm && {
@@ -1126,3 +1123,11 @@ _lvm()
 }
 complete -F _lvm lvm
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lzma

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # lzma(1) completion by Per Øyvind Karlsen <peroyvind@mandriva.org>
-#
+
 have lzma &&
 _lzma()
 {
@@ -40,3 +37,11 @@ _lzma()
 		$( compgen -d -- "$cur" ) )
 } &&
 complete -F _lzma $filenames lzma
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/lzop

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # lzop(1) completion
 
 have lzop &&
@@ -51,3 +48,11 @@ _lzop()
 		    $( compgen -d -- "$cur" ) )
 } &&
 complete -F _lzop $filenames lzop
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mailman

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Mailman completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have list_lists && {
@@ -595,3 +592,11 @@ _mailmanctl()
 
 } &&
 complete -F _mailmanctl mailmanctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/make

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for GNU make
 
 have make || have gmake || have gnumake || have pmake &&
@@ -72,3 +69,11 @@ _make()
 	fi
 } &&
 complete -F _make $filenames make gmake gnumake pmake
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/man

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # man(1) completion
-#
+
 [ $USERLAND = GNU -o $UNAME = Darwin \
   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
   -o $UNAME = OpenBSD ] &&
@@ -76,3 +73,11 @@ _man()
   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
   -o $UNAME = OpenBSD ] && \
 complete -F _man $filenames man apropos whatis
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mc

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mc
 
 have mc &&
@@ -43,3 +40,11 @@ _mc()
 	fi
 } &&
 complete -F _mc $filenames mc
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mcrypt

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # mcrypt(1) completion by Ariel Fermani <the_end@bbs.frc.utn.edu.ar>
 
 have mcrypt || have mdecrypt &&
@@ -79,3 +76,11 @@ _mcrypt()
 	fi
 } &&
 complete $filenames -F _mcrypt mcrypt mdecrypt
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mdadm

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mdadm
 
 have mdadm && {
@@ -157,3 +154,11 @@ _mdadm()
 }
 complete -F _mdadm mdadm
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/minicom

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for minicom
 
 have minicom &&
@@ -44,3 +41,11 @@ _minicom()
 	fi
 } &&
 complete -F _minicom $default minicom
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mkinitrd

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mkinitrd
 
 have mkinitrd &&
@@ -53,3 +50,11 @@ _mkinitrd()
 
 } &&
 complete -F _mkinitrd mkinitrd
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mock

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mock
 
 have mock &&
@@ -77,3 +74,11 @@ _mock()
 	fi
 } &&
 complete -F _mock $filenames mock
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/modules

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # module completion by Ted Stern <stern@cray.com>
 #
 # Completion for Environment Modules `module' alias.
@@ -84,3 +81,11 @@ _module () {
 }
 complete -F _module $default module
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/monodevelop

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Monodevelop completion
-#
+
 have monodevelop &&
 _monodevelop()
 {
@@ -95,3 +92,11 @@ _mdtool()
 	return 0
 } &&
 complete -F _mdtool $filenames mdtool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mplayer

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # mplayer(1) completion
 
 have mplayer && {
@@ -264,3 +261,11 @@ _mplayer()
 }
 complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/msynctool

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for msynctool
 
 have msynctool &&
@@ -48,3 +45,11 @@ _msynctool()
 		--manual --configdir --conflict' -- "$cur" ) )
 } &&
 complete -F _msynctool msynctool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mtx

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # mtx completion by Jon Middleton <jjm@ixtab.org.uk>
 
 have mtx &&
@@ -45,3 +42,11 @@ _mtx()
     return 0
 } &&
 complete -F _mtx mtx
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/munin-node

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for munin node
 
 have munin-run &&
@@ -98,3 +95,11 @@ _munin-node-configure()
 	fi
 } &&
 complete -F _munin-node-configure munin-node-configure
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mutt

@@ -1,10 +1,8 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # mutt completion
 #
 # 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.
+
 have mutt || have muttng && {
 _muttaddr()
 {
@@ -139,3 +137,11 @@ _mutt()
 }
 complete -F _mutt $default $filenames mutt muttng
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/mysqladmin

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mysqladmin
 
 have mysqladmin &&
@@ -33,3 +30,11 @@ _mysqladmin()
 		       -- "$cur" ) )
 } &&
 complete -F _mysqladmin mysqladmin
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/ncftp

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ncftp
 
 have ncftp &&
@@ -19,3 +16,11 @@ _ncftp()
 	return 0
 } &&
 complete -F _ncftp $default ncftp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/net-tools

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for net tools
 
 have mii-tool &&
@@ -108,3 +105,11 @@ _route()
 	return 0
 }
 [ $UNAME = Linux ] && complete -F _route route
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/ntpdate

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ntpdate
 
 have ntpdate &&
@@ -31,3 +28,11 @@ _ntpdate()
 	fi
 } &&
 complete -F _ntpdate ntpdate
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/openldap

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for openldap
 
 have ldapsearch && {
@@ -270,3 +267,11 @@ _ldappasswd()
 }
 complete -F _ldappasswd ldappasswd
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/openssl

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for openssl
 
 have openssl && {
@@ -295,3 +292,11 @@ _openssl()
 }
 complete -F _openssl $default openssl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/p4

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Perforce completion by Frank Cusack <frank@google.com>
 
 have p4 &&
@@ -54,3 +51,11 @@ _p4()
 	return 0
 } &&
 complete -F _p4 $default p4 g4
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/perl

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for perl
 
 have perl &&
@@ -117,3 +114,11 @@ _perldoc()
 }
 complete -F _perldoc $default perldoc
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/pine

@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # PINE address-book completion
-#
+
 have pine &&
 _pineaddr()
 {
@@ -15,3 +12,11 @@ _pineaddr()
 			-- "$cur" ) )
 } &&
 complete -F _pineaddr $default pine
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/pkg-config

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for pkgconfig
 
 have pkg-config &&
@@ -45,3 +42,11 @@ _pkg_config()
 	fi
 } &&
 complete -F _pkg_config pkg-config
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/pkg_install

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for FreeBSD base package management tools
 
 [ $UNAME = FreeBSD ] &&
@@ -24,3 +21,11 @@ _pkg_delete()
 complete -F _pkg_delete $dirnames pkg_delete pkg_info
 
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/pkgtools

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for Slackware Linux pkgtools
 
 have removepkg && [ -f /etc/slackware-version ] &&
@@ -15,3 +12,11 @@ _removepkg()
 } &&
 complete -F _removepkg $filenames removepkg &&
 	complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/portupgrade

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for FreeBSD portupgrade package
 
 have portupgrade &&
@@ -52,3 +49,11 @@ complete -F _portinstall $dirnames portinstall
 # _pkg_delete is in pkg_install
 type _pkg_delete &>/dev/null && have pkg_deinstall && \
 complete -F _pkg_delete $dirnames pkg_deinstall
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/postfix

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for postfix
 
 have postfix && {
@@ -229,3 +226,11 @@ _postsuper()
 }
 complete -F _postsuper $filenames postsuper
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh

contrib/postgresql

@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for Postgresql
 
 have psql && {
@@ -165,3 +162,11 @@ _psql()
 }
 complete -F _psql $filenames psql
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh