From e1de1ce843463986aa15d01feeb98edb346c6036 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@faithless.anotherrandom.com>
Date: Tue, 25 Jul 2006 19:19:59 +0100
Subject: [PATCH] Update bits and pieces that should be substituted in files.

---
 install.sh                                         | 2 +-
 scripts/build.c++.app/TopHeader.h                  | 4 ++--
 scripts/build.c++.app/TopSource.cpp                | 4 ++--
 scripts/build.c++.app/build.app                    | 4 ++--
 scripts/build.c++.app/build.install-app            | 4 ++--
 scripts/build.c++.app/build.monolithic             | 4 ++--
 scripts/build.c++.lib/BottomHeader.h               | 4 ++--
 scripts/build.c++.lib/TopHeader.h                  | 4 ++--
 scripts/build.c++.lib/TopSource.cpp                | 4 ++--
 scripts/build.c++.lib/build.install-lib            | 4 ++--
 scripts/build.c++.lib/build.lib                    | 4 ++--
 scripts/build.c++.lib/build.monolithic             | 4 ++--
 scripts/build.c++.tests/build.default              | 4 ++--
 scripts/build.c++.tests/build.tests                | 4 ++--
 scripts/build.c.app/TopHeader.h                    | 4 ++--
 scripts/build.c.app/TopSource.c                    | 4 ++--
 scripts/build.c.app/build.app                      | 4 ++--
 scripts/build.c.app/build.install-app              | 4 ++--
 scripts/build.c.app/build.monolithic               | 4 ++--
 scripts/build.c.lib/BottomHeader.h                 | 2 +-
 scripts/build.c.lib/TopHeader.h                    | 2 +-
 scripts/build.c.lib/TopSource.c                    | 2 +-
 scripts/build.c.lib/build.install-lib              | 4 ++--
 scripts/build.c.lib/build.lib                      | 4 ++--
 scripts/build.c.lib/build.monolithic               | 4 ++--
 scripts/build.c.tests/build.default                | 4 ++--
 scripts/build.c.tests/build.tests                  | 4 ++--
 scripts/build.doxygen.docs/MainPage.dox            | 4 ++--
 scripts/build.doxygen.docs/build.docs              | 4 ++--
 scripts/build.doxygen.docs/build.install-docs      | 4 ++--
 scripts/build.sdcc.firmware/TopHeader.h            | 4 ++--
 scripts/build.sdcc.firmware/TopSource.c            | 4 ++--
 scripts/build.sdcc.firmware/build.firmware         | 4 ++--
 scripts/build.sdcc.firmware/build.install-firmware | 4 ++--
 scripts/build.sdcc.firmware/build.monolithic       | 4 ++--
 scripts/module-create.sh                           | 4 ++--
 scripts/module-rename.sh                           | 4 ++--
 skel/make.sh                                       | 4 ++--
 skel/run-test.sh                                   | 4 ++--
 skel/scripts/functions.sh                          | 4 ++--
 skel/scripts/release.sh                            | 4 ++--
 skel/version                                       | 4 ++--
 42 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/install.sh b/install.sh
index d9b7475..438bcc3 100755
--- a/install.sh
+++ b/install.sh
@@ -46,7 +46,7 @@ then
     echo "Edit this file, and then re-run the build process."
     exit 1
 fi
-do_cmd src ${LWBUILDRC} || exit 1
+do_cmd source ${LWBUILDRC} || exit 1
 
 
 
diff --git a/scripts/build.c++.app/TopHeader.h b/scripts/build.c++.app/TopHeader.h
index 281f7ab..a8e3f77 100644
--- a/scripts/build.c++.app/TopHeader.h
+++ b/scripts/build.c++.app/TopHeader.h
@@ -8,6 +8,6 @@
 // standard includes, or includes needed for type declarations
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c++.app/TopSource.cpp b/scripts/build.c++.app/TopSource.cpp
index 9d055a4..74a966e 100644
--- a/scripts/build.c++.app/TopSource.cpp
+++ b/scripts/build.c++.app/TopSource.cpp
@@ -8,6 +8,6 @@
 // Below are all the includes used throughout the application.
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c++.app/build.app b/scripts/build.c++.app/build.app
index 7e70252..0bf8dd5 100644
--- a/scripts/build.c++.app/build.app
+++ b/scripts/build.c++.app/build.app
@@ -37,5 +37,5 @@ then
 
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.app/build.install-app b/scripts/build.c++.app/build.install-app
index af436a7..8703591 100644
--- a/scripts/build.c++.app/build.install-app
+++ b/scripts/build.c++.app/build.install-app
@@ -8,5 +8,5 @@ echo "Installing binaries into '${BINDIR}'"
 install_file "${@NAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.app/build.monolithic b/scripts/build.c++.app/build.monolithic
index c311844..87d167b 100644
--- a/scripts/build.c++.app/build.monolithic
+++ b/scripts/build.c++.app/build.monolithic
@@ -14,5 +14,5 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.lib/BottomHeader.h b/scripts/build.c++.lib/BottomHeader.h
index 28e508a..2ac14cb 100644
--- a/scripts/build.c++.lib/BottomHeader.h
+++ b/scripts/build.c++.lib/BottomHeader.h
@@ -8,6 +8,6 @@
 #endif
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c++.lib/TopHeader.h b/scripts/build.c++.lib/TopHeader.h
index 5da4ccc..7e327af 100644
--- a/scripts/build.c++.lib/TopHeader.h
+++ b/scripts/build.c++.lib/TopHeader.h
@@ -11,6 +11,6 @@
 // standard includes, or includes needed for type declarations
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c++.lib/TopSource.cpp b/scripts/build.c++.lib/TopSource.cpp
index 234da73..3689d7b 100644
--- a/scripts/build.c++.lib/TopSource.cpp
+++ b/scripts/build.c++.lib/TopSource.cpp
@@ -10,6 +10,6 @@
 // Below are all the includes used throughout the library.
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c++.lib/build.install-lib b/scripts/build.c++.lib/build.install-lib
index d5b4ea7..a6193c0 100644
--- a/scripts/build.c++.lib/build.install-lib
+++ b/scripts/build.c++.lib/build.install-lib
@@ -32,5 +32,5 @@ do_cmd_redir ${PKGCONFFILE} sed \
 do_cmd chmod 0644 ${PKGCONFFILE}
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.lib/build.lib b/scripts/build.c++.lib/build.lib
index dc01197..7ed8132 100644
--- a/scripts/build.c++.lib/build.lib
+++ b/scripts/build.c++.lib/build.lib
@@ -47,5 +47,5 @@ then
     @CNAME@_HEADER=${HDR}
 
 fi
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.lib/build.monolithic b/scripts/build.c++.lib/build.monolithic
index 9337e77..1ca2854 100644
--- a/scripts/build.c++.lib/build.monolithic
+++ b/scripts/build.c++.lib/build.monolithic
@@ -17,5 +17,5 @@ then
     @CNAME@_MONOLITHIC=1
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.tests/build.default b/scripts/build.c++.tests/build.default
index 29b4364..e31fc6a 100644
--- a/scripts/build.c++.tests/build.default
+++ b/scripts/build.c++.tests/build.default
@@ -1,3 +1,3 @@
 source src/@NAME@/build.tests
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c++.tests/build.tests b/scripts/build.c++.tests/build.tests
index e2ef355..a4dce09 100644
--- a/scripts/build.c++.tests/build.tests
+++ b/scripts/build.c++.tests/build.tests
@@ -39,5 +39,5 @@ then
     @NAME@_BUILT=1
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.app/TopHeader.h b/scripts/build.c.app/TopHeader.h
index 4f989d5..6a90fbc 100644
--- a/scripts/build.c.app/TopHeader.h
+++ b/scripts/build.c.app/TopHeader.h
@@ -8,6 +8,6 @@
 // standard includes, or includes needed for type declarations
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c.app/TopSource.c b/scripts/build.c.app/TopSource.c
index 3e61cae..89e3b89 100644
--- a/scripts/build.c.app/TopSource.c
+++ b/scripts/build.c.app/TopSource.c
@@ -8,6 +8,6 @@
 // Below are all the includes used throughout the application.
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.c.app/build.app b/scripts/build.c.app/build.app
index f64db08..bd1167f 100644
--- a/scripts/build.c.app/build.app
+++ b/scripts/build.c.app/build.app
@@ -37,5 +37,5 @@ then
 
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.app/build.install-app b/scripts/build.c.app/build.install-app
index af436a7..8703591 100644
--- a/scripts/build.c.app/build.install-app
+++ b/scripts/build.c.app/build.install-app
@@ -8,5 +8,5 @@ echo "Installing binaries into '${BINDIR}'"
 install_file "${@NAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.app/build.monolithic b/scripts/build.c.app/build.monolithic
index cb1160c..878d05d 100644
--- a/scripts/build.c.app/build.monolithic
+++ b/scripts/build.c.app/build.monolithic
@@ -14,5 +14,5 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.lib/BottomHeader.h b/scripts/build.c.lib/BottomHeader.h
index f5a7be0..219b758 100644
--- a/scripts/build.c.lib/BottomHeader.h
+++ b/scripts/build.c.lib/BottomHeader.h
@@ -8,5 +8,5 @@
 #endif
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+kate: @KATE_MODELINE@
 */
diff --git a/scripts/build.c.lib/TopHeader.h b/scripts/build.c.lib/TopHeader.h
index 1d12a6f..4c1220b 100644
--- a/scripts/build.c.lib/TopHeader.h
+++ b/scripts/build.c.lib/TopHeader.h
@@ -11,5 +11,5 @@
 // standard includes, or includes needed for type declarations
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+kate: @KATE_MODELINE@
 */
diff --git a/scripts/build.c.lib/TopSource.c b/scripts/build.c.lib/TopSource.c
index 8bed521..ab4c73d 100644
--- a/scripts/build.c.lib/TopSource.c
+++ b/scripts/build.c.lib/TopSource.c
@@ -10,5 +10,5 @@
 // Below are all the includes used throughout the library.
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+kate: @KATE_MODELINE@
 */
diff --git a/scripts/build.c.lib/build.install-lib b/scripts/build.c.lib/build.install-lib
index d5b4ea7..a6193c0 100644
--- a/scripts/build.c.lib/build.install-lib
+++ b/scripts/build.c.lib/build.install-lib
@@ -32,5 +32,5 @@ do_cmd_redir ${PKGCONFFILE} sed \
 do_cmd chmod 0644 ${PKGCONFFILE}
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.lib/build.lib b/scripts/build.c.lib/build.lib
index 11324e0..b6a62ea 100644
--- a/scripts/build.c.lib/build.lib
+++ b/scripts/build.c.lib/build.lib
@@ -47,5 +47,5 @@ then
     @CNAME@_HEADER=${HDR}
 
 fi
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.lib/build.monolithic b/scripts/build.c.lib/build.monolithic
index 680b456..d9d36de 100644
--- a/scripts/build.c.lib/build.monolithic
+++ b/scripts/build.c.lib/build.monolithic
@@ -17,5 +17,5 @@ then
     @CNAME@_MONOLITHIC=1
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.tests/build.default b/scripts/build.c.tests/build.default
index 29b4364..e31fc6a 100644
--- a/scripts/build.c.tests/build.default
+++ b/scripts/build.c.tests/build.default
@@ -1,3 +1,3 @@
 source src/@NAME@/build.tests
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.c.tests/build.tests b/scripts/build.c.tests/build.tests
index 27c71c6..2daf8b7 100644
--- a/scripts/build.c.tests/build.tests
+++ b/scripts/build.c.tests/build.tests
@@ -39,5 +39,5 @@ then
     @NAME@_BUILT=1
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.doxygen.docs/MainPage.dox b/scripts/build.doxygen.docs/MainPage.dox
index 44336a5..34482ec 100644
--- a/scripts/build.doxygen.docs/MainPage.dox
+++ b/scripts/build.doxygen.docs/MainPage.dox
@@ -10,6 +10,6 @@
 */
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.doxygen.docs/build.docs b/scripts/build.doxygen.docs/build.docs
index a04b6e8..f486639 100644
--- a/scripts/build.doxygen.docs/build.docs
+++ b/scripts/build.doxygen.docs/build.docs
@@ -39,5 +39,5 @@ then
     @NAME@_BUILT=1
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.doxygen.docs/build.install-docs b/scripts/build.doxygen.docs/build.install-docs
index 66167d3..d6d60a2 100644
--- a/scripts/build.doxygen.docs/build.install-docs
+++ b/scripts/build.doxygen.docs/build.install-docs
@@ -17,5 +17,5 @@ do
 done
 
 print_success "Documentation installed"
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/TopHeader.h b/scripts/build.sdcc.firmware/TopHeader.h
index 4f989d5..6a90fbc 100644
--- a/scripts/build.sdcc.firmware/TopHeader.h
+++ b/scripts/build.sdcc.firmware/TopHeader.h
@@ -8,6 +8,6 @@
 // standard includes, or includes needed for type declarations
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.sdcc.firmware/TopSource.c b/scripts/build.sdcc.firmware/TopSource.c
index 3e61cae..89e3b89 100644
--- a/scripts/build.sdcc.firmware/TopSource.c
+++ b/scripts/build.sdcc.firmware/TopSource.c
@@ -8,6 +8,6 @@
 // Below are all the includes used throughout the application.
 
 /* options for text editors
-kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-vim: expandtab:ts=4:sw=4
+kate: @KATE_MODELINE@
+vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.sdcc.firmware/build.firmware b/scripts/build.sdcc.firmware/build.firmware
index 397b457..1a8f695 100644
--- a/scripts/build.sdcc.firmware/build.firmware
+++ b/scripts/build.sdcc.firmware/build.firmware
@@ -37,5 +37,5 @@ then
 
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/build.install-firmware b/scripts/build.sdcc.firmware/build.install-firmware
index a141de6..5ec79c2 100644
--- a/scripts/build.sdcc.firmware/build.install-firmware
+++ b/scripts/build.sdcc.firmware/build.install-firmware
@@ -8,5 +8,5 @@ echo "Installing firmware into '${HEXDIR}'"
 install_file "${@NAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/build.monolithic b/scripts/build.sdcc.firmware/build.monolithic
index 6691075..35a1f60 100644
--- a/scripts/build.sdcc.firmware/build.monolithic
+++ b/scripts/build.sdcc.firmware/build.monolithic
@@ -14,5 +14,5 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/module-create.sh b/scripts/module-create.sh
index 9b48b27..cab6ae3 100755
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# @P@/scripts/module-create.sh
+# lw-build-system/scripts/module-create.sh
 #
-#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
 #  Released under the GNU GPLv2. See file COPYING or
 #  http://www.gnu.org/copyleft/gpl.html for details.
 #
diff --git a/scripts/module-rename.sh b/scripts/module-rename.sh
index 0a43cab..a7c8d1a 100755
--- a/scripts/module-rename.sh
+++ b/scripts/module-rename.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# @P@/scripts/module-rename.sh
+# lw-build-system/scripts/module-rename.sh
 #
-#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
 #  Released under the GNU GPLv2. See file COPYING or
 #  http://www.gnu.org/copyleft/gpl.html for details.
 #
diff --git a/skel/make.sh b/skel/make.sh
index 13a1803..e1a725c 100755
--- a/skel/make.sh
+++ b/skel/make.sh
@@ -284,5 +284,5 @@ done
 
 exit 0
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/skel/run-test.sh b/skel/run-test.sh
index 9c49bd8..0687a38 100755
--- a/skel/run-test.sh
+++ b/skel/run-test.sh
@@ -50,5 +50,5 @@ fi
 
 run_test $*
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/skel/scripts/functions.sh b/skel/scripts/functions.sh
index c6b1e5b..d66acc1 100755
--- a/skel/scripts/functions.sh
+++ b/skel/scripts/functions.sh
@@ -64,5 +64,5 @@ do_cmd_redir() {
     fi
 }
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/skel/scripts/release.sh b/skel/scripts/release.sh
index e592048..8f7f63e 100755
--- a/skel/scripts/release.sh
+++ b/skel/scripts/release.sh
@@ -76,5 +76,5 @@ gpg -a -b "${PKGNAME}-doc.tar.bz2"
 # clean up
 rm -rf "${PKGNAME}" "${PKGNAME}-doc"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/skel/version b/skel/version
index 65b3506..7ef8ff3 100644
--- a/skel/version
+++ b/skel/version
@@ -15,5 +15,5 @@ VERMINOR=0
 VERMICRO=0
 VEREXTRA=""
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@