about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2021-04-06 23:36:53 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2021-04-06 23:38:52 +0900
commit9562a1ee7bd0d9cb4793f2441c7709e3da6dcefe (patch)
tree3ed59d1b4bd66adcfdb85e2793bce1fc4d55b645
parent0f62e07c802e3fa58d1199f34fcf9772da70c264 (diff)
downloadzsh-9562a1ee7bd0d9cb4793f2441c7709e3da6dcefe.tar.gz
zsh-9562a1ee7bd0d9cb4793f2441c7709e3da6dcefe.tar.xz
zsh-9562a1ee7bd0d9cb4793f2441c7709e3da6dcefe.zip
48391: fix display problem in menu-complete
Take account of the trailing file type character even when '-d disp'
is given to compadd.
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/compresult.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54d65ae61..4bcf659e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2021-04-06  Jun-ichi Takimoto  <takimoto-j@kba.biglobe.ne.jp>
 
+	* 48391: Src/Zle/compresult.c: correctly calculate display string
+	width in completion list to fix display problem in menu-complete
+
 	* 48389: Src/math.c, Src/utils.c: getkeystring(GETKEY_SINGLE_CHAR)
 	should not return a pointer to a local variable
 
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 30fc60b78..8b5955819 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -1583,7 +1583,7 @@ calclist(int showall)
                             nlines += 1 + printfmt(m->disp, 0, 0, 0);
                             g->flags |= CGF_HASDL;
                         } else {
-                            l = ZMB_nicewidth(m->disp);
+                            l = ZMB_nicewidth(m->disp) + !!m->modec;
                             ndisp++;
                             if (l > glong)
                                 glong = l;