* PATCH: nomenucom and globcomp
@ 1999-03-15 9:51 Sven Wischnowsky
0 siblings, 0 replies; only message in thread
From: Sven Wischnowsky @ 1999-03-15 9:51 UTC (permalink / raw)
To: zsh-workers
This week's first apologies go to those who don't use menucompletion
but have globcomplete set.
The patch I sent in 5775 (turn on menucompletion if `compstate[pattern_match]'
was explicitly set) made menucompletion always turned on for them.
Bye
Sven
diff -u os/Zle/zle_tricky.c Src/Zle/zle_tricky.c
--- os/Zle/zle_tricky.c Fri Mar 12 20:39:48 1999
+++ Src/Zle/zle_tricky.c Fri Mar 12 20:40:31 1999
@@ -5032,6 +5032,7 @@
docompletion(char *s, int lst, int incmd)
{
HEAPALLOC {
+ char *opm;
LinkNode n;
pushheap();
@@ -5045,7 +5046,7 @@
((isset(AUTOLIST) && !isset(BASHAUTOLIST)) ?
(isset(LISTAMBIGUOUS) ? 3 : 2) : 0) : 1);
zsfree(comppatmatch);
- comppatmatch = ztrdup(useglob ? "yes" : "");
+ opm = comppatmatch = ztrdup(useglob ? "yes" : "");
zsfree(compforcelist);
compforcelist = ztrdup("");
haspattern = 0;
@@ -5057,7 +5058,7 @@
clearlist = 1;
goto compend;
}
- if (comppatmatch && *comppatmatch)
+ if (comppatmatch && *comppatmatch && comppatmatch != opm)
haspattern = 1;
if (!useline && uselist)
/* All this and the guy only wants to see the list, sigh. */
--
Sven Wischnowsky wischnow@informatik.hu-berlin.de
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~1999-03-15 9:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1999-03-15 9:51 PATCH: nomenucom and globcomp Sven Wischnowsky
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).