From 86bfd6075d7e7bf1f68097f11dbef94439e1f605 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 13 Jan 2020 23:11:19 -0500 Subject: acme: fix movetodel for spaces in file names --- src/cmd/acme/wind.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/cmd/acme') diff --git a/src/cmd/acme/wind.c b/src/cmd/acme/wind.c index 248680fe..2782dbc7 100644 --- a/src/cmd/acme/wind.c +++ b/src/cmd/acme/wind.c @@ -110,18 +110,15 @@ windrawbutton(Window *w) int delrunepos(Window *w) { - int n; - Rune rune; + Rune *r; + int i; - for(n=0; ntag.file->b.nc; n++) { - bufread(&w->tag.file->b, n, &rune, 1); - if(rune == ' ') - break; - } - n += 2; - if(n >= w->tag.file->b.nc) + r = parsetag(w, &i); + free(r); + i += 2; + if(i >= w->tag.file->b.nc) return -1; - return n; + return i; } void @@ -441,7 +438,7 @@ parsetag(Window *w, int *len) { static Rune Ldelsnarf[] = { ' ', 'D', 'e', 'l', ' ', 'S', 'n', 'a', 'r', 'f', 0 }; static Rune Lspacepipe[] = { ' ', '|', 0 }; - static Rune Ltabpipe[] = { ' ', '|', 0 }; + static Rune Ltabpipe[] = { '\t', '|', 0 }; int i; Rune *r, *p, *pipe; -- cgit v1.2.3