From 724508d30c788da653579d44ac3566f27ffed1d6 Mon Sep 17 00:00:00 2001
From: Frank Terbeck <ft@grml.org>
Date: Wed, 6 Aug 2008 14:09:13 +0200
Subject: [PATCH] Removing xunfunction()

Caused more trouble than being useful.
---
 debian/changelog |  4 +++-
 etc/skel/.zshrc  |  3 ---
 etc/zsh/zshrc    | 13 -------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffc9d8a..577d621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ grml-etc-core (0.3.51) unstable; urgency=low
   [ Frank Terbeck ]
   * zshrc: Add persistent dirstack support for shells older than 4.2.0
   * zshrc: Make ',.' abbreviation optional [Closes: issue445]
+  * zshrc: remove xunfunction() altogether; it prevented things like
+           'source ~/.zshrc' from working.
 
   [ Michael Gebetsroither ]
   * zshrc: add runit sysv emulation support to Start/Stop/Restart/...
@@ -18,7 +20,7 @@ grml-etc-core (0.3.51) unstable; urgency=low
       killall (thanks, ft).
   * zshenv: set $PATH on Solaris/SunOS.
 
- -- Michael Prokop <mika@grml.org>  Sun, 03 Aug 2008 20:24:37 +0200
+ -- Frank Terbeck <ft@grml.org>  Wed, 06 Aug 2008 14:06:36 +0200
 
 grml-etc-core (0.3.50) unstable; urgency=low
 
diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc
index 93e8fcd..62c82a8 100644
--- a/etc/skel/.zshrc
+++ b/etc/skel/.zshrc
@@ -1310,9 +1310,6 @@ gethgsnap() {
 # modifications in ~/.zshrc.local
 xsource "${HOME}/.zshrc.local"
 
-# ...and remove utility functions again.
-xunfunction
-
 # }}}
 
 ### doc strings for external functions from files
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index b804a7f..ce69695 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -306,19 +306,6 @@ xcat() {
     return 0
 }
 
-# Remove these functions again, they are of use only in these
-# setup files. This should be called at the end of .zshrc.
-xunfunction() {
-    local -a funcs
-    funcs=(salias xcat xsource xunfunction zrcautoload)
-
-    for func in $funcs ; do
-        [[ -n ${functions[$func]} ]] \
-            && unfunction $func
-    done
-    return 0
-}
-
 # autoload wrapper - use this one instead of autoload directly
 function zrcautoload() {
     setopt local_options extended_glob
-- 
2.1.4