mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

empty description means: don't add a -X option (14252)

Browse source
This commit is contained in:
Sven Wischnowsky 2001-05-08 08:46:59 +00:00
parent a3e01003c8
commit ff82191c26
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2001-05-08 Sven Wischnowsky <wischnow@zsh.org> 2001-05-08 Sven Wischnowsky <wischnow@zsh.org>
* 14252: Completion/Base/Core/_description, Doc/Zsh/compsys.yo:
empty description means: don't add a -X option
* 14251: Src/Zle/complist.c, Src/Zle/zle_tricky.c: print * 14251: Src/Zle/complist.c, Src/Zle/zle_tricky.c: print
space/backspace when reaching the last column while printing space/backspace when reaching the last column while printing
descriptions and the like to avoid a cursor positioning bug descriptions and the like to avoid a cursor positioning bug

9
Completion/Base/Core/_description
View file

@ -9,7 +9,8 @@ if [[ "$1" = -([12]|)[VJ] ]]; then
shift shift
fi fi
_lastdescr=( "$_lastdescr[@]" "$3" ) 3="${${3##[[:blank:]]#}%%[[:blank:]]#}"
[[ -n "$3" ]] && _lastdescr=( "$_lastdescr[@]" "$3" )
zstyle -s ":completion:${curcontext}:$1" group-name gname && zstyle -s ":completion:${curcontext}:$1" group-name gname &&
[[ -z "$gname" ]] && gname="$1" [[ -z "$gname" ]] && gname="$1"
@ -51,7 +52,11 @@ else
fi fi
shift 2 shift 2
[[ -n "$format" ]] && zformat -f format "$format" "d:$1" "${(@)argv[2,-1]}" if [[ -z "$1" && $# -eq 1 ]]; then
format=
elif [[ -n "$format" ]]; then
zformat -f format "$format" "d:$1" "${(@)argv[2,-1]}"
fi
if [[ -n "$gname" ]]; then if [[ -n "$gname" ]]; then
if [[ -n "$format" ]]; then if [[ -n "$format" ]]; then

13
Doc/Zsh/compsys.yo
View file

@ -2879,7 +2879,9 @@ item(var(n)tt(::)var(message)tt(:)var(action))(
This describes the var(n)'th normal argument. The var(message) will be This describes the var(n)'th normal argument. The var(message) will be
printed above the matches generated and the var(action) says what can printed above the matches generated and the var(action) says what can
be completed in this position (see below). If there are two colons be completed in this position (see below). If there are two colons
before the var(message), this describes an optional argument. before the var(message), this describes an optional argument. If the
var(message) contains only white space, nothing will be printed above
the matches unless the action adds an explanation string itself.
) )
xitem(tt(:)var(message)tt(:)var(action)) xitem(tt(:)var(message)tt(:)var(action))
item(tt(::)var(message)tt(:)var(action))( item(tt(::)var(message)tt(:)var(action))(
@ -3008,7 +3010,8 @@ xitem(tt(:)var(message)tt(:)var(action))
item(tt(::)var(message)tt(:)var(action))( item(tt(::)var(message)tt(:)var(action))(
Describes a mandatory argument with one colon, or an optional argument Describes a mandatory argument with one colon, or an optional argument
with two colons. As in other forms of var(spec), the var(message) will be with two colons. As in other forms of var(spec), the var(message) will be
printed above the matches generated and the var(action) says what can be printed above the matches generated (unless it contains only white
space, see above) and the var(action) says what can be
completed in this position. completed in this position.
) )
xitem(tt(:*)var(pattern)tt(:)var(message)tt(:)var(action)) xitem(tt(:*)var(pattern)tt(:)var(message)tt(:)var(action))
@ -3460,7 +3463,11 @@ function which tests some more styles.
The string returned by the tt(format) style (if any) will be modified so The string returned by the tt(format) style (if any) will be modified so
that the sequence `tt(%d)' is replaced by the var(descr) given as the third that the sequence `tt(%d)' is replaced by the var(descr) given as the third
argument. If tt(_description) is called with more than three arguments, argument without any leading or trailing white space. If, after
removing the white space, the var(descr) is the empty string, the format
style will not be used and the options put into the var(name) array will
not contain an explantion string to be displayed above the matches.If
tt(_description) is called with more than three arguments,
the additional var(specs) should be of the form `var(char)tt(:)var(str)' the additional var(specs) should be of the form `var(char)tt(:)var(str)'
and every appearance of `tt(%)var(char)' in the format string will be and every appearance of `tt(%)var(char)' in the format string will be
replaced by var(string). replaced by var(string).