From 1070e95c2e69a17540eb608b819d40f8ca5f37f4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 24 Feb 2007 21:29:48 +0100 Subject: [PATCH] drop the $ZSH_VERSION checks, the do not work for zsh-beta package --- debian/changelog | 6 ++++++ etc/zsh/zshrc | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d041da..5e6c7de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,12 @@ grml-etc-core (0.2.23) unstable; urgency=low - add a space character in some abbreviation expansions so it's better readable. - added insert-unicode-char + - drop the check for + /usr/share/zsh/$ZSH_VERSION/functions/Prompts/promptinit and + /usr/share/zsh/$ZSH_VERSION/functions/Zle/url-quote-magic + because the check does not work for example with the zsh-beta + package. If you notice problems with the current code please + let me know. * /etc/skel/.zshrc: - added function ytdl (download video from youtube) - work around non utf8 capable software in utf environment diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 75ac0f6..5742118 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -244,9 +244,7 @@ fi autoload history-search-end # we don't want to quote/espace URLs on our own... - # avoid 'url-quote-magic: function definition file not found' on some older boxes - if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Zle/url-quote-magic" ] && \ - autoload -U url-quote-magic && zle -N self-insert url-quote-magic ; then + if autoload -U url-quote-magic ; then zle -N self-insert url-quote-magic else print 'Notice: no url-quote-magic available :(' @@ -414,7 +412,7 @@ fi # }}} # {{{ set prompt - if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Prompts/promptinit" ] && autoload promptinit && promptinit 2>/dev/null ; then + if autoload promptinit && promptinit 2>/dev/null ; then promptinit # people should be able to use their favourite prompt else print 'Notice: no promptinit available :(' -- 2.1.4