mirrors/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting synced 2024-09-20 16:39:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

driver: Use a different way of checking whether add-zle-hook-widget is present.

Browse source 
Based on code by Bart Schaefer (reference within).

Tested with zsh 5.0.7-5 (debian package) and with 5b4cbcc842c6 (39158,
5.3-to-be of today).
This commit is contained in:
Daniel Shahaf 2016-09-05 03:23:08 +00:00 committed by Matthew Martin
parent d98622dcd0
commit 38477f2a3d
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
zsh-syntax-highlighting.zsh
View file

@ -49,10 +49,37 @@ if true; then
fi
fi
# This function takes a single argument F and returns True iff F denotes the
# name of a callable function. A function is callable if it is fully defined
# or if it is marked for autoloading and autoloading it at the first call to it
# will succeed. In particular, if a function has been marked for autoloading
# but is not available in $fpath, then this function will return False therefor.
#
# See users/21671 http://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=21671
_zsh_highlight__function_callable_p() {
{ # Trenary condition: if the zle/parameter module is available, ...
if (( ${+functions} )); then
# ... then use it to make the decision, ...
if (( ${+functions[$1]} )); then
[[ "$functions[$1]" != *"builtin autoload -X" ]] \
||
( unfunction -- "$1" && autoload -U +X -- "$1" 2>/dev/null )
else
( autoload -U +X -- "$1" 2>/dev/null )
fi
else
# ... otherwise, use a fallback approach.
autoload -U +X -- "$1" 2>/dev/null
[[ "${${(@f)"$(which -- "$1")"}[2]}" != $'\t'$histchars[3]' undefined' ]]
fi
}
# Do nothing here! We return the exit code of the if.
}
integer zsh_highlight_use_redrawhook
if autoload -U +X -- add-zle-hook-widget 2>/dev/null;
[[ "${${(@f)"$(which -- add-zle-hook-widget)"}[2]}" != $'\t'$histchars[3]' undefined' ]];
if _zsh_highlight__function_callable_p add-zle-hook-widget
then
autoload -U add-zle-hook-widget
(( zsh_highlight_use_redrawhook=1 ))
fi