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

52189: ignore compadd -M if -U also specified as they don't make sense together

Browse source 
This fixes df completion.
This commit is contained in:
Oliver Kiddle 2023-09-26 23:08:54 +02:00
parent 985952e2f6
commit 70320635b4
3 changed files with 9 additions and 2 deletions
ChangeLog
Completion/Unix/Type
_umountable
Src/Zle
complete.c

4
ChangeLog
View file

@ -1,5 +1,9 @@
2023-10-10 Oliver Kiddle <opk@zsh.org> 2023-10-10 Oliver Kiddle <opk@zsh.org>
* 52189: Completion/Unix/Type/_umountable, Src/Zle/complete.c:
ignore compadd -M if -U also specified as they don't make
sense together, this fixes df completion
* 52217: Completion/BSD/Command/_freebsd-update, * 52217: Completion/BSD/Command/_freebsd-update,
Completion/BSD/Command/_ipfw, Completion/BSD/Command/_pfctl, Completion/BSD/Command/_ipfw, Completion/BSD/Command/_pfctl,
Completion/BSD/Command/_sockstat, Completion/Unix/Command/_cmp, Completion/BSD/Command/_sockstat, Completion/Unix/Command/_cmp,

3
Completion/Unix/Type/_umountable
View file

@ -1,6 +1,6 @@
#autoload #autoload
local tmp local tmp
local dev_tmp dpath_tmp mp_tmp mline local -a dev_tmp dpath_tmp mp_tmp mline
case "$OSTYPE" in case "$OSTYPE" in
linux*) linux*)
@ -15,6 +15,7 @@ irix*)
;; ;;
freebsd*|dragonfly*) freebsd*|dragonfly*)
/sbin/mount | while read mline; do /sbin/mount | while read mline; do
[[ $mline[(w)1] = map ]] && continue
dev_tmp+=( $mline[(w)1] ) dev_tmp+=( $mline[(w)1] )
mp_tmp+=( $mline[(w)3] ) mp_tmp+=( $mline[(w)3] )
done done

4
Src/Zle/complete.c
View file

@ -829,7 +829,9 @@ bin_compadd(char *name, char **argv, UNUSED(Options ops), UNUSED(int func))
ca_args: ca_args:
if (mstr && (match = parse_cmatcher(name, mstr)) == pcm_err) { if (mstr && (dat.aflags & CAF_MATCH) &&
(match = parse_cmatcher(name, mstr)) == pcm_err)
{
zsfree(mstr); zsfree(mstr);
zfree(dat.dpar, dparsize); zfree(dat.dpar, dparsize);
return 1; return 1;