diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 5 | ||||
| -rw-r--r-- | Src/Zle/compctl.c | 1 | ||||
| -rw-r--r-- | Src/Zle/compresult.c | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 37d21335e..cc57282ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-04-13 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> + * 10725: Src/Zle/compcore.c, Src/Zle/compctl.c, + Src/Zle/compresult.c: comment the `#if's for group numbers in + $compstate[insert] + * 10724: Src/Zle/compresult.c, Src/Zle/zle_tricky.c: display number of matches again when asking if a completion list should be shown (only when not zero) diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 33fb435db..6e2cbf537 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -63,6 +63,7 @@ int movetoend; mod_export int insmnum, insspace; #if 0 +/* group-numbers in compstate[insert] */ int insgnum, insgroup; /* mod_export */ #endif @@ -754,11 +755,13 @@ callcompfunc(char *s, char *fn) useline = 2, usemenu = 0; else if (idigit(*compinsert)) { #if 0 + /* group-numbers in compstate[insert] */ char *m; #endif useline = 1; usemenu = 3; insmnum = atoi(compinsert); #if 0 + /* group-numbers in compstate[insert] */ if ((m = strchr(compinsert, ':'))) { insgroup = 1; insgnum = atoi(m + 1); @@ -778,6 +781,7 @@ callcompfunc(char *s, char *fn) if (useline && (p = strchr(compinsert, ':'))) { insmnum = atoi(++p); #if 0 + /* group-numbers in compstate[insert] */ if ((p = strchr(p, ':'))) { insgroup = 1; insgnum = atoi(p + 1); @@ -851,6 +855,7 @@ makecomplist(char *s, int incmd, int lst) isuf = NULL; insmnum = 1; #if 0 + /* group-numbers in compstate[insert] */ insgnum = 1; insgroup = 0; #endif diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index b1fc694c4..accd97c93 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -1814,6 +1814,7 @@ ccmakehookfn(Hookdef dummy, struct ccmakedat *dat) isuf = NULL; insmnum = 1; #if 0 + /* group-numbers in compstate[insert] */ insgnum = 1; insgroup = 0; #endif diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index c7217778c..e56110a70 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1077,6 +1077,7 @@ do_ambig_menu(void) minfo.cur = NULL; } #if 0 + /* group-numbers in compstate[insert] */ if (insgroup) { insgnum = comp_mod(insgnum, lastpermgnum); for (minfo.group = amatches; @@ -1101,6 +1102,7 @@ do_ambig_menu(void) return; } #if 0 + /* group-numbers in compstate[insert] */ } #endif mc = (minfo.group)->matches + insmnum; |