From 0a88c244ed49aa67543e3fc9b9a5b213e229472d Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Sun, 13 Dec 2015 14:45:22 +0000
Subject: Uncontroversial

Changes from Mikael's bcf975a2ea3ebc6ba1ed8150b376bef45e527cda:

- paramsubst: Change setting of 'ziplen'
---
 Src/Zle/compcore.c    |  2 +-
 Src/Zle/computil.c    | 14 +++++++-------
 Src/Zle/zle_main.c    |  5 +++--
 Src/Zle/zle_refresh.c |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'Src/Zle')

diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index ae7068fc9..0c32be14b 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -1952,7 +1952,7 @@ get_user_var(char *nam)
 	char **arr = NULL, *val;
 
 	queue_signals();
-	if ((arr = getaparam(nam)) || (arr = gethparam(nam)))
+	if ((arr = getaparam(nam, NULL)) || (arr = gethparam(nam)))
 	    arr = (incompfunc ? arrdup(arr) : arr);
 	else if ((val = getsparam(nam))) {
 	    arr = (char **) zhalloc(2*sizeof(char *));
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index e8f0a6fe7..184b263ee 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -870,7 +870,7 @@ bin_compdescribe(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
         } else {
             char **opts;
 
-            if (!(opts = getaparam(args[4]))) {
+            if (!(opts = getaparam(args[4], NULL))) {
 		zwarnnam(nam, "unknown parameter: %s", args[4]);
 		return 1;
             }
@@ -4838,16 +4838,16 @@ bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
 		return 1;
 	    }
 	    queue_signals();
-	    if (!(tmp = getaparam(args[1]))) {
+	    if (!(tmp = getaparam(args[1], NULL))) {
 		zwarnnam(nam, "unknown parameter: %s", args[1]);
 		return 0;
 	    }
 	    for (l = newlinklist(); *tmp; tmp++)
 		addlinknode(l, *tmp);
 	    set_list_array(args[1], cf_pats((args[0][1] == 'P'), !!args[0][2],
-					    l, getaparam(args[2]), args[3],
+					    l, getaparam(args[2], NULL), args[3],
 					    args[4], args[5],
-					    getaparam(args[6]), args + 7));
+					    getaparam(args[6], NULL), args + 7));
 	    unqueue_signals();
 	    return 0;
 	}
@@ -4868,12 +4868,12 @@ bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
 		return 1;
 	    }
 	    queue_signals();
-	    tmp = getaparam(args[2]);
+	    tmp = getaparam(args[2], NULL);
 	    l = newlinklist();
 	    if (tmp)
 		for (; *tmp; tmp++)
 		    addlinknode(l, *tmp);
-	    if (!(tmp = getaparam(args[1]))) {
+	    if (!(tmp = getaparam(args[1], NULL))) {
 		unqueue_signals();
 		zwarnnam(nam, "unknown parameter: %s", args[1]);
 		return 0;
@@ -4898,7 +4898,7 @@ bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
 		return 1;
 	    }
 	    queue_signals();
-	    if (!(tmp = getaparam(args[1]))) {
+	    if (!(tmp = getaparam(args[1], NULL))) {
 		unqueue_signals();
 		zwarnnam(nam, "unknown parameter: %s", args[1]);
 		return 0;
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 472e326d1..9bea76e9b 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1170,6 +1170,7 @@ char *
 zleread(char **lp, char **rp, int flags, int context, char *init, char *finish)
 {
     char *s, **bracket;
+    int bracket_len;
     int old_errno = errno;
     int tmout = getiparam("TMOUT");
 
@@ -1299,7 +1300,7 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish)
 
     zlecallhook(init, NULL);
 
-    if ((bracket = getaparam("zle_bracketed_paste")) && arrlen(bracket) == 2)
+    if ((bracket = getaparam("zle_bracketed_paste", &bracket_len)) && bracket_len == 2)
 	fputs(*bracket, shout);
 
     zrefresh();
@@ -1311,7 +1312,7 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish)
 		  "ZLE_VARED_ABORTED" :
 		  "ZLE_LINE_ABORTED", zlegetline(NULL, NULL));
 
-    if ((bracket = getaparam("zle_bracketed_paste")) && arrlen(bracket) == 2)
+    if ((bracket = getaparam("zle_bracketed_paste", &bracket_len)) && bracket_len == 2)
 	fputs(bracket[1], shout);
 
     if (done && !exit_pending && !errflag)
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index aca676a1c..13ab144ed 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -313,7 +313,7 @@ static const REFRESH_ELEMENT zr_start_ellipsis[] = {
 static void
 zle_set_highlight(void)
 {
-    char **atrs = getaparam("zle_highlight");
+    char **atrs = getaparam("zle_highlight", NULL);
     int special_atr_on_set = 0;
     int region_atr_on_set = 0;
     int isearch_atr_on_set = 0;
-- 
cgit 1.4.1