about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@ipost.com>2021-09-08 16:01:12 -0700
committerBart Schaefer <schaefer@ipost.com>2021-09-08 16:01:12 -0700
commitc4d07b3ec0415fa04c490f2f5233194d44da1c7a (patch)
tree026be9a4c74923fab20a4ce52df231c5beb7c277
parent3b97a36847234e15e89688fa70eb9990d919ae66 (diff)
downloadzsh-c4d07b3ec0415fa04c490f2f5233194d44da1c7a.tar.gz
zsh-c4d07b3ec0415fa04c490f2f5233194d44da1c7a.tar.xz
zsh-c4d07b3ec0415fa04c490f2f5233194d44da1c7a.zip
49387: suffix highlight with "compadd -R"
-rw-r--r--ChangeLog2
-rw-r--r--Src/Zle/zle_misc.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e96375cab..ae0bfccc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2021-09-08  Bart Schaefer  <schaefer@zsh.org>
 
+	* 49387: Src/Zle/zle_misc.c: suffix highlight with "compadd -R"
+
 	* 49386: Test/Z03run-help.ztst: handle separate source/build trees
 
 2021-09-08  Jun-ichi Takimoto  <takimoto-j@kba.biglobe.ne.jp>
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index 612ac2138..eba28d1ec 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -1508,9 +1508,6 @@ static struct suffixset *suffixlist;
 /**/
 static char *suffixfunc;
 
-/* Length associated with the suffix function */
-static int suffixfunclen;
-
 /* Whether to remove suffix on uninsertable characters */
 /**/
 int suffixnoinsrem;
@@ -1611,7 +1608,7 @@ makesuffixstr(char *f, char *s, int n)
     if (f) {
 	zsfree(suffixfunc);
 	suffixfunc = ztrdup(f);
-	suffixfunclen = n;
+	suffixlen = n;
     } else if (s) {
 	int inv, i, z = 0;
 	ZLE_STRING_T ws, lasts, wptr;
@@ -1685,7 +1682,7 @@ iremovesuffix(ZLE_INT_T c, int keep)
 		unmetafy_line();
 	    }
 
-	    sprintf(buf, "%d", suffixfunclen);
+	    sprintf(buf, "%d", suffixlen);
 	    addlinknode(args, suffixfunc);
 	    addlinknode(args, buf);
 
@@ -1800,5 +1797,5 @@ fixsuffix(void)
 	suffixlist = next;
     }
 
-    suffixfunclen = suffixnoinsrem = suffixlen = 0;
+    suffixnoinsrem = suffixlen = 0;
 }