zsh: Make sure xsource works in any case; add modelines for vim

diff --git a/debian/changelog b/debian/changelog
index bbd6476..54e373f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ grml-etc-core (0.3.41) unstable; urgency=low
 
   [ Michael Prokop ]
   * zsh: add alias 'g' for git
+  * zsh: set modelines for vim according to new indenting policy
 
   [ Frank Terbeck ]
   * zsh: several small cleanups by ft [thanks!]

diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc
index 8196337..7af2f0a 100644 (file)
--- a/etc/skel/.zshrc
+++ b/etc/skel/.zshrc
@@ -1243,7 +1243,11 @@ gethgsnap() {
 # this allows us to stay in sync with /etc/skel/.zshrc
 # through 'ln -s /etc/skel/.zshrc ~/.zshrc' and put own
 # modifications in ~/.zshrc.local
-xsource "${HOME}/.zshrc.local"
+if type xsource &>/dev/null ; then
+    xsource "${HOME}/.zshrc.local"
+else
+    xsource "${HOME}/.zshrc.local"
+fi
 
 # ...and remove utility functions again.
 xunfunction
@@ -1253,4 +1257,4 @@ xunfunction
 ### doc strings for external functions from files
 #m# f5 grml-wallpaper() Sets a wallpaper (try completion for possible values)
 ## END OF FILE #################################################################
-# vim:foldmethod=marker
+# vim:foldmethod=marker autoindent expandtab shiftwidth=4

diff --git a/etc/zsh/keephack b/etc/zsh/keephack
index 16d8b00..9d4cb92 100644 (file)
--- a/etc/zsh/keephack
+++ b/etc/zsh/keephack
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Jän 27 23:38:57 CET 2005 [mika]
+# Latest change: Don Dez 06 23:21:30 CET 2007 [mika]
 ################################################################################
 
 # save output in a variable for later use
@@ -89,5 +89,5 @@ zle -C _expand_word complete-word _expand_word_and_keep
 zstyle ':completion:*' insert-kept menu
 zmodload -i zsh/complist
 
-# vim:filetype=zsh
 ## END OF FILE #################################################################
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4

diff --git a/etc/zsh/zlogin b/etc/zsh/zlogin
index 0f16342..4bcee8d 100644 (file)
--- a/etc/zsh/zlogin
+++ b/etc/zsh/zlogin
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Feb 24 19:05:18 CET 2007 [mika]
+# Latest change: Don Dez 06 23:21:33 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for login shells. It
 # should contain commands that should be executed only
@@ -17,3 +17,4 @@
 ################################################################################
 # nothing yet.
 ## END OF FILE #################################################################
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4

diff --git a/etc/zsh/zlogout b/etc/zsh/zlogout
index 8d06040..7558484 100644 (file)
--- a/etc/zsh/zlogout
+++ b/etc/zsh/zlogout
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Feb 24 19:06:14 CET 2007 [mika]
+# Latest change: Don Dez 06 23:21:35 CET 2007 [mika]
 ################################################################################
 # Shutdown files (.zlogout and zlogout) are run, when a login shell exits.
 
@@ -11,3 +11,4 @@
 clear
 
 ## END OF FILE #################################################################
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4

diff --git a/etc/zsh/zprofile b/etc/zsh/zprofile
index 11b1dc2..7f49510 100644 (file)
--- a/etc/zsh/zprofile
+++ b/etc/zsh/zprofile
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Feb 24 18:59:47 CET 2007 [mika]
+# Latest change: Don Dez 06 23:21:02 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for login shells (i.e. shells
 # invoked with "-" as the first character of argv[0], and
@@ -13,3 +13,4 @@
 ################################################################################
 # nothing yet
 ## END OF FILE #################################################################
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index ee83290..6fd51b0 100644 (file)
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Jul 25 15:02:01 CEST 2007 [mika]
+# Latest change: Don Dez 06 23:21:08 CET 2007 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # It is the 1st file zsh reads; it's read for every shell,
@@ -102,3 +102,4 @@ export DISTCC_HOSTS="+zeroconf"
 export WRITE_ON_UDEV=yes
 
 ## END OF FILE #################################################################
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index acf9072..963aab6 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Nov 22 11:13:15 CET 2007 [mika]
+# Latest change: Don Dez 06 23:21:21 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -1748,4 +1748,4 @@ ZSHRC_GLOBAL_HAS_BEEN_READ=1
 # }}}
 
 ## END OF FILE #################################################################
-# vim:foldmethod=marker expandtab
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4