diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Completion/Core/_path_files | 8 | ||||
| -rw-r--r-- | Doc/Zsh/compsys.yo | 11 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index fa1544fb9..103ced64b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-23 Sven Wischnowsky <wischnow@zsh.org> + + * 13037: Completion/Core/_path_files, Doc/Zsh/compsys.yo: change + some tags used in filename completion: no tag for file-sort, + fake-files and ignore-parents, paths for accept-exact + 2000-10-21 Bart Schaefer <schaefer@zsh.org> * 13057: Src/Zle/zle_main.c: `vared -h' should not imply `vared -e'; diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files index 5133ef2b2..e95b3f184 100644 --- a/Completion/Core/_path_files +++ b/Completion/Core/_path_files @@ -96,7 +96,7 @@ fi (( $#matcher )) && mopts=( "$mopts[@]" "$matcher[@]" ) -if zstyle -s ":completion:${curcontext}:files" file-sort tmp1; then +if zstyle -s ":completion:${curcontext}:" file-sort tmp1; then case "$tmp1" in *size*) sort=oL;; *links*) sort=ol;; @@ -141,10 +141,10 @@ zstyle -s ":completion:${curcontext}:paths" special-dirs sdirs [[ "$pats" = ((|*[[:blank:]])\*(|[[:blank:]]*)|*\([^[:blank:]]#/[^[:blank:]]#\)*) ]] && sopt=$sopt/ -zstyle -a ":completion:${curcontext}:files" accept-exact accex -zstyle -a ":completion:${curcontext}:files" fake-files fake +zstyle -a ":completion:${curcontext}:paths" accept-exact accex +zstyle -a ":completion:${curcontext}:" fake-files fake -zstyle -s ":completion:${curcontext}:files" ignore-parents ignpar +zstyle -s ":completion:${curcontext}:" ignore-parents ignpar if [[ -n "$compstate[pattern_match]" && ( ( -z "$SUFFIX" && "$PREFIX" = (|*[^\$])\([^\|\~]##\) ) || diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index ba6d99ccb..32f0d4ea4 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -848,7 +848,7 @@ matches. If it is set to `true' for at least one match which is the same as the string on the line, this match will immediately be accepted. -When completing filenames (where it is looked up for the tt(files) +When completing pathnames (where it is looked up for the tt(paths) tag), this style also accepts any number of patterns as the value. If this is used, pathnames matching one of these patterns will be accepted immediately even if the command line contains some more @@ -1014,8 +1014,8 @@ components after the first ambiguous one. ) kindex(fake-files, completion style) item(tt(fake-files))( -Currently, this style is only used when completing files and looked up -with the tag tt(files). Its values are of the form +This style is used when completing files and looked up +without a tag. Its values are of the form `var(dir)tt(:)var(names...)'. This will add the var(names) (strings separated by spaces) as possible matches when completing in the directory var(dir), even if no @@ -1098,7 +1098,7 @@ tt(EXTENDED_GLOB) option is in effect, so the characters `tt(#)', kindex(file-sort, completion style) item(tt(file-sort))( The completion function that generates filenames as possible matches -uses this style with the tt(files) tag to determine in which order the +uses this style without a tag to determine in which order the names should be listed and completed when using menu completion. The value may be one of `tt(size)' to sort them by the size of the file, `tt(links)' to sort them by the number of links to the file, @@ -1271,7 +1271,8 @@ in question accepts the option more than once. ) kindex(ignore-parents, completion style) item(tt(ignore-parents))( -The style is tested for the tt(files) tag to determine whether to ignore +The style is tested by the function completing pathnames without a tag to +determine whether to ignore the names of directories already mentioned in the current word, or the name of the current working directory. The value must include one or both of the following strings: |