Pick up a couple of post-5.2 patches from the list (so no need to push

these upstream).

Fix a segfault in zsh (workers/37337).

diff --git a/Src/Zle/zle.h b/Src/Zle/zle.h

index 2d672de..e9b1428 100644

--- a/Src/Zle/zle.h

+++ b/Src/Zle/zle.h

@@ -213,6 +213,8 @@ struct widget {

 #define ZLE_KEEPSUFFIX	(1<<9)	/* DON'T remove added suffix */

 #define ZLE_NOTCOMMAND  (1<<10)	/* widget should not alter lastcmd */

 #define ZLE_ISCOMP      (1<<11)	/* usable for new style completion */

+#define WIDGET_INUSE    (1<<12) /* widget is in use */

+#define WIDGET_FREE     (1<<13) /* request to free when no longer in use */

 /* thingies */

diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c

index 38427e8..1f0c07d 100644

--- a/Src/Zle/zle_main.c

+++ b/Src/Zle/zle_main.c

@@ -1344,6 +1344,8 @@ execzlefunc(Thingy func, char **args, int set_bindk)

 	    eofsent = 1;

 	    ret = 1;

 	} else {

+	    int inuse = wflags & WIDGET_INUSE;

+	    w->flags |= WIDGET_INUSE;

 	    if(!(wflags & ZLE_KEEPSUFFIX))

 		removesuffix();

 	    if(!(wflags & ZLE_MENUCMP)) {

@@ -1367,6 +1369,12 @@ execzlefunc(Thingy func, char **args, int set_bindk)

 		ret = w->u.fn(args);

 		unqueue_signals();

 	    }

+	    if (!inuse) {

+		if (w->flags & WIDGET_FREE)

+		    freewidget(w);

+		else

+		    w->flags &= ~WIDGET_INUSE;

+	    }

 	    if (!(wflags & ZLE_NOTCOMMAND))

 		lastcmd = wflags;

 	}

@@ -1387,6 +1395,8 @@ execzlefunc(Thingy func, char **args, int set_bindk)

 	    int osc = sfcontext, osi = movefd(0);

 	    int oxt = isset(XTRACE);

 	    LinkList largs = NULL;

+	    int inuse = w->flags & WIDGET_INUSE;

+	    w->flags |= WIDGET_INUSE;

 	    if (*args) {

 		largs = newlinklist();

@@ -1402,8 +1412,15 @@ execzlefunc(Thingy func, char **args, int set_bindk)

 	    opts[XTRACE] = oxt;

 	    sfcontext = osc;

 	    endparamscope();

-	    lastcmd = w->flags;

-	    w->flags = 0;

+	    lastcmd = w->flags & ~(WIDGET_INUSE|WIDGET_FREE);

+	    if (inuse) {

+		w->flags &= WIDGET_INUSE|WIDGET_FREE;

+	    } else {

+		if (w->flags & WIDGET_FREE)

+		    freewidget(w);

+		else

+		    w->flags = 0;

+	    }

 	    r = 1;

 	    redup(osi, 0);

 	}

diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c

index 271fd8e..21495b6 100644

--- a/Src/Zle/zle_thingy.c

+++ b/Src/Zle/zle_thingy.c

@@ -253,9 +253,14 @@ unbindwidget(Thingy t, int override)

 /* Free a widget. */

 /**/

-static void

+void

 freewidget(Widget w)

 {

+    if (w->flags & WIDGET_INUSE) {

+	w->flags |= WIDGET_FREE;

+	return;

+    }

+

     if (w->flags & WIDGET_NCOMP) {

 	zsfree(w->u.comp.wid);

 	zsfree(w->u.comp.func);

Fix a bug with bindkey and unicode characters (users/21071).

diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c

index 069580f..d6d116b 100644

--- a/Src/Zle/zle_keymap.c

+++ b/Src/Zle/zle_keymap.c

@@ -1503,7 +1503,7 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)

 		    f->widget->flags & ZLE_VIOPER);

 #ifdef MULTIBYTE_SUPPORT

 	    if ((f == Th(z_selfinsert) || f == Th(z_selfinsertunmeta)) &&

-		!lastchar_wide_valid) {

+		!lastchar_wide_valid && !ispfx) {

 		int len;

 		VARARR(char, mbc, MB_CUR_MAX);

 		ZLE_INT_T inchar = getrestchar(lastchar, mbc, &len);

_subscript - fix completion of associative array keys (workers/37788)

diff --git a/Completion/Zsh/Context/_subscript b/Completion/Zsh/Context/_subscript

index 0ccc0c4..679f129 100644

--- a/Completion/Zsh/Context/_subscript

+++ b/Completion/Zsh/Context/_subscript

@@ -81,8 +81,8 @@ elif compset -P '\('; then

 elif [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then

   local suf MATCH MBEGIN MEND

   local -a keys

-  keys=(${${(kP)compstate[parameter]}//(#m)[\$\\\[\]\(\)\[\{\}]/\\$MATCH})

-  keys=(${keys//#%(#m)[*@]/(e)$MATCH})

+  keys=("${(@)${(@k)${(P)compstate[parameter]}}//(#m)[\$\\\[\]\(\)\[\{\}]/\\$MATCH}")

+  keys=("${(@)keys//#%(#m)[*@]/(e)$MATCH}")

   [[ "$RBUFFER" != (|\\)\]* ]] && suf="$osuf"

   _wanted association-keys expl 'association key' \