From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.auc.dk
Subject: PATCH: small fix for compmatchers
Date: Tue, 2 Nov 1999 12:01:55 +0100 (MET) [thread overview]
Message-ID: <199911021101.MAA30678@beta.informatik.hu-berlin.de> (raw)
An empty string in `compmatchers' should mean that completion without
global match specs should be tried.
Weird, I thought I already had made sure that that worked...
Bye
Sven
diff -u oldsrc/Zle/compcore.c Src/Zle/compcore.c
--- oldsrc/Zle/compcore.c Fri Oct 29 15:03:06 1999
+++ Src/Zle/compcore.c Tue Nov 2 11:55:57 1999
@@ -800,15 +800,14 @@
int n;
for (n = 0; m; m = m->next, n++) {
- if (m->matcher) {
- *mp = (Cmlist) zhalloc(sizeof(struct cmlist));
- (*mp)->matcher = m->matcher;
- (*mp)->next = NULL;
- (*mp)->str = dupstring(m->str);
- mp = &((*mp)->next);
- addlinknode(matchers, m->matcher);
+ *mp = (Cmlist) zhalloc(sizeof(struct cmlist));
+ (*mp)->matcher = m->matcher;
+ (*mp)->next = NULL;
+ (*mp)->str = dupstring(m->str);
+ mp = &((*mp)->next);
+ addlinknode(matchers, m->matcher);
+ if (m->matcher)
m->matcher->refc++;
- }
}
m = mm;
compmatcher = 1;
diff -u oldsrc/Zle/compmatch.c Src/Zle/compmatch.c
--- oldsrc/Zle/compmatch.c Fri Oct 29 15:03:06 1999
+++ Src/Zle/compmatch.c Tue Nov 2 11:55:49 1999
@@ -1016,7 +1016,7 @@
while (len) {
for (t = 0, ms = bmatchers; ms && !t; ms = ms->next) {
mp = ms->matcher;
- if (mp->flags == CMF_RIGHT && mp->wlen == -1 &&
+ if (mp && mp->flags == CMF_RIGHT && mp->wlen == -1 &&
!mp->llen && len >= mp->ralen && mp->ralen &&
pattern_match(mp->right, str, NULL, NULL)) {
int olen = str - p, llen;
@@ -1136,7 +1136,7 @@
t = 0;
for (ms = bmatchers; ms && !t; ms = ms->next) {
mp = ms->matcher;
- if (!mp->flags && mp->wlen <= wlen && mp->llen <= l &&
+ if (mp && !mp->flags && mp->wlen <= wlen && mp->llen <= l &&
pattern_match(mp->line, (sfx ? line - mp->llen : line),
NULL, ea) &&
pattern_match(mp->word, (sfx ? word - mp->wlen : word),
@@ -1186,7 +1186,7 @@
/* Different characters, try the matchers. */
for (t = 0, ms = bmatchers; ms && !t; ms = ms->next) {
mp = ms->matcher;
- if (!mp->flags && mp->wlen > 0 && mp->llen > 0 &&
+ if (mp && !mp->flags && mp->wlen > 0 && mp->llen > 0 &&
mp->wlen <= la && mp->wlen <= lb) {
/* The pattern has no anchors and the word
* pattern fits, try it. */
@@ -1373,7 +1373,7 @@
/* We use only those patterns that match a non-empty
* string in both the line and the word and that have
* no anchors. */
- if (!mp->flags && mp->wlen > 0 && mp->llen > 0) {
+ if (mp && !mp->flags && mp->wlen > 0 && mp->llen > 0) {
/* We first test, if the old string matches already the
* new one. */
if (mp->llen <= ol && mp->wlen <= nl &&
--
Sven Wischnowsky wischnow@informatik.hu-berlin.de
reply other threads:[~1999-11-02 11:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=199911021101.MAA30678@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).