PATCH: special-dirs

PATCH: special-dirs

[Sven Wischnowsky]

After several mails from Andy Spiegel I finally realised that (and
how) the special-dirs style wasn't tested correctly. Especially with
GLOB_DOTS set. This should fix it.

Andy: does it work now?

Bye
 Sven

diff -ru ../z.old/Completion/Core/_path_files Completion/Core/_path_files
--- ../z.old/Completion/Core/_path_files	Mon Jan 17 13:54:45 2000
+++ Completion/Core/_path_files	Tue Jan 18 09:17:23 2000
@@ -264,27 +264,26 @@
 
     if [[ "$tpre$tsuf" = */* ]]; then
       tmp2=( ${^tmp1}*(-/) )
-      if [[ ! -o globdots && "$PREFIX" = .* ]]; then
-        tmp2=( "$tmp2[@]" ${^tmp1}.*(-/) )
-	if zstyle -s ":completion${curcontext}:paths" special-dirs atmp; then
-	  if [[ "$atmp" = (yes|true|1|on) ]]; then
-	    tmp2=( "$tmp2[@]" . .. )
-	  elif [[ "$atmp" = .. ]]; then
-	    tmp2=( "$tmp2[@]" .. )
-          fi
+      [[ ! -o globdots && "$PREFIX" = .* ]] &&
+          tmp2=( "$tmp2[@]" ${^tmp1}.*(-/) )
+      if [[ -o globdots || "$PREFIX" = .* ]] &&
+         zstyle -s ":completion${curcontext}:paths" special-dirs atmp; then
+	if [[ "$atmp" = (yes|true|1|on) ]]; then
+	  tmp2=( "$tmp2[@]" . .. )
+	elif [[ "$atmp" = .. ]]; then
+	  tmp2=( "$tmp2[@]" .. )
         fi
       fi
     else
       tmp2=( ${^tmp1}${^~pats} )
-      if [[ ! -o globdots && "$PREFIX" = .* ]]; then
-        tmp2=( "$tmp2[@]" ${^tmp1}.${^~pats} )
-        if [[ "$sopt" = */* ]] &&
-	   zstyle -s ":completion${curcontext}:paths" special-dirs atmp; then
-	  if [[ "$atmp" = (yes|true|1|on) ]]; then
-	    tmp2=( "$tmp2[@]" . .. )
-	  elif [[ "$atmp" = .. ]]; then
-	    tmp2=( "$tmp2[@]" .. )
-          fi
+      [[ ! -o globdots && "$PREFIX" = .* ]] &&
+          tmp2=( "$tmp2[@]" ${^tmp1}.${^~pats} )
+      if [[ "$sopt" = *[/f]* && ( -o globdots || "$PREFIX" = .* ) ]] &&
+	 zstyle -s ":completion${curcontext}:paths" special-dirs atmp; then
+	if [[ "$atmp" = (yes|true|1|on) ]]; then
+	  tmp2=( "$tmp2[@]" . .. )
+	elif [[ "$atmp" = .. ]]; then
+	  tmp2=( "$tmp2[@]" .. )
         fi
       fi
     fi

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: PATCH: special-dirs

[Andy Spiegl]

Hi Sven,

> After several mails from Andy Spiegel I finally realised that (and
> how) the special-dirs style wasn't tested correctly. Especially with
> GLOB_DOTS set. This should fix it.
> 
> Andy: does it work now?
Yes, yes, yes, it works, yeepeeh!  You are the greatest!

Thanks so much,
 Andy.

-- 
 E-Mail: Andy@spiegl.de     URL: http://andy.spiegl.de
 PGP/GPG: see headers
                                o      _     _         _
  --------- __o       __o      /\_   _ \\o  (_)\__/o  (_)
  ------- _`\<,_    _`\<,_    _>(_) (_)/<_    \_| \   _|/' \/
  ------ (_)/ (_)  (_)/ (_)  (_)        (_)   (_)    (_)'  _\o_
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 If you steal from one author, it's plagiarism;
 if you steal from many, it's research.  (Wilson Milner)

Error building zsh under FreeBSD

[Ollivier Robert]

I'm using the CVS repository and here is what I get trying to compile
it... Any idea?

-=-=-
srcdir='.' MODBINS='modules-bltin'  XMODCF='./xmods.conf' /bin/sh ./mkbltnmlst.sh bltinmods.list
WARNING: ./xmods.conf lists non-existent module `cap' (ignored)
WARNING: ./xmods.conf lists non-existent module `clone' (ignored)
WARNING: ./xmods.conf lists non-existent module `compctl' (ignored)
WARNING: ./xmods.conf lists non-existent module `complete' (ignored)
WARNING: ./xmods.conf lists non-existent module `complist' (ignored)
WARNING: ./xmods.conf lists non-existent module `computil' (ignored)
WARNING: ./xmods.conf lists non-existent module `deltochar' (ignored)
WARNING: ./xmods.conf lists non-existent module `example' (ignored)
WARNING: ./xmods.conf lists non-existent module `files' (ignored)
WARNING: ./xmods.conf lists non-existent module `mapfile' (ignored)
WARNING: ./xmods.conf lists non-existent module `mathfunc' (ignored)
WARNING: ./xmods.conf lists non-existent module `parameter' (ignored)
WARNING: ./xmods.conf lists non-existent module `rlimits' (ignored)
WARNING: ./xmods.conf lists non-existent module `sched' (ignored)
WARNING: ./xmods.conf lists non-existent module `stat' (ignored)
WARNING: ./xmods.conf lists non-existent module `zftp' (ignored)
WARNING: ./xmods.conf lists non-existent module `zle' (ignored)
WARNING: ./xmods.conf lists non-existent module `zleparameter' (ignored)
WARNING: ./xmods.conf lists non-existent module `zutil' (ignored)
./../: 43: Syntax error: EOF in backquote substitution
*** Error code 2

Stop in /spare/build/zsh/Src.
*** Error code 1

Stop in /spare/build/zsh/Src.
*** Error code 1

-=-=-

mymods.conf contains only this:
-=-=-
rlimits
zle
complete
compctl
stat
complist
computil
parameter
zleparameter
-=-=-
-- 
Ollivier ROBERT -=- Eurocontrol EEC/TEC -=- roberto@eurocontrol.fr
The Postman hits! The Postman hits! You have new mail.

Re: Error building zsh under FreeBSD

[Zefram]

Ollivier Robert wrote:
>WARNING: ./xmods.conf lists non-existent module `cap' (ignored)
>WARNING: ./xmods.conf lists non-existent module `clone' (ignored)
>WARNING: ./xmods.conf lists non-existent module `compctl' (ignored)
...

You need to run Util/preconfig.

-zefram