diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_dict_words | 17 | ||||
| -rwxr-xr-x | Config/installfns.sh | 4 | ||||
| -rw-r--r-- | Functions/Compctl/.distfiles | 4 | ||||
| -rw-r--r-- | Src/zsh.mdd | 2 |
5 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 199be0528..d35f5c34d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-04-02 Sven Wischnowsky <wischnow@zsh.org> + * Config/installfns.sh, Src/zsh.mdd: more cleanup after + function moving + * unposted, kind of: moving functions and scripts around, renaming them, accidentally deleted them and re-installing them, etc. diff --git a/Completion/Unix/Type/_dict_words b/Completion/Unix/Type/_dict_words new file mode 100644 index 000000000..44448e8f8 --- /dev/null +++ b/Completion/Unix/Type/_dict_words @@ -0,0 +1,17 @@ +#autoload + +local dict dictresult dictwords j expl + +[[ -z $words[CURRENT] ]] && return 1 + +dictresults=(${${(f)${"$(dict -m $words[CURRENT])":gs/ + / /}}:#[0-9]*matches found}) + +for j in ${dictresults} +do + dict=${j%%:*} + dictwords=(${(z)j#*:}) + + _wanted $dict expl "words from $dict" \ + compadd -M 'm:{a-zA-Z}={A-Za-z} r:|=*' -a "$@" - dictwords +done diff --git a/Config/installfns.sh b/Config/installfns.sh index 90258c7dd..63b981a44 100755 --- a/Config/installfns.sh +++ b/Config/installfns.sh @@ -15,6 +15,10 @@ for file in $allfuncs; do if test -f $sdir_top/$file; then if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then case "$file" in + Completion/comp*) + subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`" + instdir="$fndir/Completion" + ;; Completion/*) subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`" instdir="$fndir/$subdir" diff --git a/Functions/Compctl/.distfiles b/Functions/Compctl/.distfiles new file mode 100644 index 000000000..d4eea91f5 --- /dev/null +++ b/Functions/Compctl/.distfiles @@ -0,0 +1,4 @@ +DISTFILES_SRC=' +.distfiles +cdmatch cdmatch2 multicomp +' diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 555b2afe1..e2b7b91b5 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -49,7 +49,7 @@ zshpaths.h: Makemod $(CONFIG_INCS) $(dir_top)/config.modules | sed -e '/^#/d' -e '/ link=no/d' \ -e 's/^.* functions=//'`"; \ fpath_tmp=`for f in $$fpath_tmp; do \ - echo $$f | sed -e 's%^Functions/%%' -e 's%/[^/]*$$%%'; \ + echo $$f | sed -e 's%^Functions/%%' -e 's%/[^/]*$$%%' -e 's%/\*%%'; \ done | sort | uniq`; \ fpath_tmp=`echo $$fpath_tmp | sed 's/ /\", \"/g'`; \ echo "#define FPATH_SUBDIRS { \"$$fpath_tmp\" }" \ |