[PATCH 1/2] add-zle-hook-widget: Support running under NO_UNSET ('set -u').

[PATCH 1/2] add-zle-hook-widget: Support running under NO_UNSET ('set -u').

[Daniel Shahaf]

---
 Functions/Misc/add-zle-hook-widget | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Functions/Misc/add-zle-hook-widget b/Functions/Misc/add-zle-hook-widget
index d8a3950fb..9cc35496f 100644
--- a/Functions/Misc/add-zle-hook-widget
+++ b/Functions/Misc/add-zle-hook-widget
@@ -129,7 +129,7 @@ function add-zle-hook-widget {
     else
 	# Check whether attempting to add a widget named for the hook
 	if [[ "$fn" = "$hook" ]]; then
-	    if [[ -n "${widgets[$fn]}" ]]; then
+	    if (( ${+widgets[$fn]} )); then
 		print -u2 "$funcstack[1]: Cannot hook $fn to itself"
 		return 1
 	    fi
@@ -141,8 +141,8 @@ function add-zle-hook-widget {
 	integer i=${#options[ksharrays]}-2
 	zstyle -g extant_hooks "$hook" widgets
         # Check for an existing widget, add it as the first hook
-	if [[ ${widgets[$hook]} != "user:azhw:$hook" ]]; then
-	    if [[ -n ${widgets[$hook]} ]]; then
+	if [[ ${widgets[$hook]:-} != "user:azhw:$hook" ]]; then
+	    if [[ -n ${widgets[$hook]:-} ]]; then
 		zle -A "$hook" "${widgets[$hook]}"
 		extant_hooks=(0:"${widgets[$hook]}" "${extant_hooks[@]}")
 	    fi
@@ -152,17 +152,17 @@ function add-zle-hook-widget {
 	if [[ -z ${(M)extant_hooks[@]:#(<->:|)$fn} ]]; then
        	    # no index and not already hooked
             # assign largest existing index plus 1
-	    i=${${(On@)${(@M)extant_hooks[@]#<->:}%:}[i]}+1
+	    i=${${(On@)${(@M)extant_hooks[@]#<->:}%:}[i]:-0}+1
 	else
 	    return 0
 	fi
 	extant_hooks+=("${i}:${fn}")
 	zstyle -- "$hook" widgets "${extant_hooks[@]}"
-	if [[ -z "${widgets[$fn]}" ]]; then
+	if (( ! ${+widgets[$fn]} )); then
 	    autoload "${autoopts[@]}" -- "$fn"
 	    zle -N -- "$fn"
 	fi
-	if [[ -z "${widgets[$hook]}" ]]; then
+	if (( ! ${+widgets[$hook]} )); then
 	    zle -N "$hook" azhw:"$hook"
 	fi
     fi

[PATCH 2/2] add-zle-hook-widget: Add a missing arithmetic evaluation to the new index's computation.

[Daniel Shahaf]

---
 Functions/Misc/add-zle-hook-widget | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Functions/Misc/add-zle-hook-widget b/Functions/Misc/add-zle-hook-widget
index 9cc35496f..121cf0349 100644
--- a/Functions/Misc/add-zle-hook-widget
+++ b/Functions/Misc/add-zle-hook-widget
@@ -152,7 +152,7 @@ function add-zle-hook-widget {
 	if [[ -z ${(M)extant_hooks[@]:#(<->:|)$fn} ]]; then
        	    # no index and not already hooked
             # assign largest existing index plus 1
-	    i=${${(On@)${(@M)extant_hooks[@]#<->:}%:}[i]:-0}+1
+	    (( i = ${${(On@)${(@M)extant_hooks[@]#<->:}%:}[i]:-0} + 1 ))
 	else
 	    return 0
 	fi

Re: [PATCH 2/2] add-zle-hook-widget: Add a missing arithmetic evaluation to the new index's computation.

[Daniel Shahaf]

Daniel Shahaf wrote on Fri, 12 Oct 2018 13:40 +0000:
> +++ b/Functions/Misc/add-zle-hook-widget
> @@ -152,7 +152,7 @@ function add-zle-hook-widget {
> -	    i=${${(On@)${(@M)extant_hooks[@]#<->:}%:}[i]:-0}+1
> +	    (( i = ${${(On@)${(@M)extant_hooks[@]#<->:}%:}[i]:-0} + 1 ))

Never mind, Matthew just pointed out to me that the code was correct
as is (assigning to integers implicitly does evaluation).  I'll skip
this patch.