From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.auc.dk
Subject: Re: completion features
Date: Fri, 12 Mar 1999 10:36:18 +0100 (MET) [thread overview]
Message-ID: <199903120936.KAA02982@beta.informatik.hu-berlin.de> (raw)
In-Reply-To: Peter Stephenson's message of Thu, 11 Mar 1999 18:02:19 +0100
Peter Stephenson wrote:
> 1.
> _path_files won't handle path-expansion after directories in the stack,
> e.g. ~1/f/b won't go to ~1/foo/bar (even if that exists). Sometimes it
> tries to quote the ~ on the command line, which doesn't stop it doing
> normal completion (even though technically that's now a literal tilde), but
> doesn't help it do multipath completion.
About the completion after things like `~1/': this works for me, at
least after the patch to `_pth_files' I sent in reply to Andrej. Also,
the patch below should make the treatment of quoted/unquoted
metacharacters more consistent. (I just hate the interaction of
completion and quoting...).
Hm, Peter, could you try it again?
Bye
Sven
diff -u os/Zle/zle_tricky.c Src/Zle/zle_tricky.c
--- os/Zle/zle_tricky.c Thu Mar 11 17:22:37 1999
+++ Src/Zle/zle_tricky.c Fri Mar 12 10:27:38 1999
@@ -894,21 +894,23 @@
* change the command line, do completion. */
if (olst == COMP_EXPAND_COMPLETE &&
!strcmp(ol, (char *)line)) {
- char *p;
-
cs = ocs;
errflag = 0;
- p = s;
- if (*p == Tilde || *p == Equals)
- p++;
- for (; *p; p++)
- if (itok(*p)) {
- if (*p != String && *p != Qstring)
- *p = ztokens[*p - Pound];
- else if (p[1] == Inbrace)
- p++, skipparens(Inbrace, Outbrace, &p);
- }
+ if (!compfunc) {
+ char *p;
+
+ p = s;
+ if (*p == Tilde || *p == Equals)
+ p++;
+ for (; *p; p++)
+ if (itok(*p)) {
+ if (*p != String && *p != Qstring)
+ *p = ztokens[*p - Pound];
+ else if (p[1] == Inbrace)
+ p++, skipparens(Inbrace, Outbrace, &p);
+ }
+ }
docompletion(s, lst, lincmd);
}
} else
@@ -5233,19 +5235,23 @@
compquote = ztrdup("");
compquoting = ztrdup("");
}
- untokenize(s = dupstring(s));
zsfree(compprefix);
zsfree(compsuffix);
if (unset(COMPLETEINWORD)) {
- compprefix = ztrdup(s);
+ tmp = quotename(s, NULL, NULL, NULL);
+ untokenize(tmp);
+ compprefix = ztrdup(tmp);
compsuffix = ztrdup("");
} else {
char *ss = s + offs, sav;
-
+
+ tmp = quotename(s, &ss, NULL, NULL);
sav = *ss;
*ss = '\0';
- compprefix = ztrdup(s);
+ untokenize(tmp);
+ compprefix = ztrdup(tmp);
*ss = sav;
+ untokenize(ss);
compsuffix = ztrdup(ss);
}
zsfree(compiprefix);
--
Sven Wischnowsky wischnow@informatik.hu-berlin.de
next reply other threads:[~1999-03-12 9:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-03-12 9:36 Sven Wischnowsky [this message]
1999-03-12 9:38 ` Peter Stephenson
-- strict thread matches above, loose matches on Subject: below --
1999-03-15 9:59 Sven Wischnowsky
1999-03-12 13:10 Sven Wischnowsky
1999-03-12 16:19 ` Bart Schaefer
1999-03-13 17:59 ` Bart Schaefer
1999-03-12 8:55 Sven Wischnowsky
1999-03-11 17:02 Peter Stephenson
1999-03-11 22:06 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=199903120936.KAA02982@beta.informatik.hu-berlin.de \
--to=wischnow@informatik.hu-berlin.de \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).