mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 13:01:28 +02:00
Code Releases Activity

display number of matches again when asking if a completion list should be shown (only when not zero) (10724)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-04-13 08:05:57 +00:00
parent 3715a5bbcf
commit a8400e82b1
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-04-13 Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
* 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)
2000-04-12 Bart Schaefer <schaefer@brasslantern.com>
* 10706: Andrej: Completion/User/_man: Fix quoting in awk args.

11
Src/Zle/compresult.c
View file

@ -1587,10 +1587,15 @@ mod_export int asklist(void)
((complistmax > 0 && listdat.nlist >= complistmax) ||
(complistmax < 0 && listdat.nlines <= -complistmax) ||
(!complistmax && listdat.nlines >= lines))) {
int qup;
int qup, l;
zsetterm();
qup = printfmt("zsh: do you wish to see all %n lines? ",
listdat.nlines, 1, 1);
l = (listdat.nlist > 0 ?
fprintf(shout, "zsh: do you wish to see all %d possibilities (%d lines)? ",
listdat.nlist, listdat.nlines) :
fprintf(shout, "zsh: do you wish to see all %d lines? ",
listdat.nlines));
qup = ((l + columns - 1) / columns) - 1;
fflush(shout);
if (getzlequery() != 'y') {
if (clearflag) {

9
Src/Zle/zle_tricky.c
View file

@ -1988,11 +1988,14 @@ listlist(LinkList l)
max = getiparam("LISTMAX");
if ((max && num > max) || (!max && nlines > lines)) {
int qup;
int qup, l;
zsetterm();
qup = printfmt("zsh: do you wish to see all %n lines? ",
nlines, 1, 1);
l = (num > 0 ?
fprintf(shout, "zsh: do you wish to see all %d possibilities (%d lines)? ",
num, nlines) :
fprintf(shout, "zsh: do you wish to see all %d lines? ", nlines));
qup = ((l + columns - 1) / columns) - 1;
fflush(shout);
if (getzlequery() != 'y') {
if (clearflag) {