From 63eb4e7e440945a63672492b99844c5feae0a60c Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Sun, 22 Mar 2009 11:20:40 +0100
Subject: whichf: return 1 if no function definition file was found

---
 etc/functions/finfo  | 2 +-
 etc/functions/help   | 2 +-
 etc/functions/whichf | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/functions/finfo b/etc/functions/finfo
index 87b8acd..a73606d 100755
--- a/etc/functions/finfo
+++ b/etc/functions/finfo
@@ -3,7 +3,7 @@
 ## Assume that a function begins with an introduction, and print it
 typeset line
 
-[[ -n $(whichf $1) ]] || return 1
+whichf $1 &> /dev/null || return 1
 
 while read line; do
 	[[ $line == \#* ]] || break
diff --git a/etc/functions/help b/etc/functions/help
index bb061ae..1b338b2 100755
--- a/etc/functions/help
+++ b/etc/functions/help
@@ -3,7 +3,7 @@
 
 if man -w $1 &> /dev/null; then
 	man $1
-elif [[ -n $(whichf $1) ]]; then
+elif whichf $1 &> /dev/null; then
 	finfo $1
 elif (( ${+builtins[$1]} )); then
 	man zshbuiltins | less -p "       $1"
diff --git a/etc/functions/whichf b/etc/functions/whichf
index dc8d04b..01026c4 100755
--- a/etc/functions/whichf
+++ b/etc/functions/whichf
@@ -1,2 +1,7 @@
 ## vim:ft=zsh
-echo ${^fpath}/$1(-.N)
+## locate the file corresponding to a function
+if [[ -n $(echo ${^fpath}/$1(-.N)) ]] {
+	echo ${^fpath}/$1(-.N)
+} else {
+	return 1
+}
-- 
cgit v1.2.3