From 71f1653020563696b162753539137e355f585c4d Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 4 Aug 2016 15:54:24 +0000 Subject: 38994: _man: Fix two bugs when completing manpage filenames in separate-sections mode. - No longer glob all files (the (-g)-less _path_files was virtually always called, by at least one of the multiple calls to _man_pages). - Actually separate sections (by propagating $expl). --- ChangeLog | 3 +++ Completion/Unix/Command/_man | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87a462ef6..82178dfdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-08-05 Daniel Shahaf + * 38994: Completion/Unix/Command/_man: Fix two bugs when + completing manpage filenames in separate-sections mode. + * 38993: Completion/Unix/Command/_man: Drop (b): it's incorrect when $sect contains '|'. diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man index ef17ad8ee..ffe53be5e 100644 --- a/Completion/Unix/Command/_man +++ b/Completion/Unix/Command/_man @@ -87,6 +87,13 @@ _man() { done (( ret )) || return 0 done + ## To fall back to other sections' manpages when completing filenames, like + ## the 'else' codepath does: + # + # if (( ret )) && [[ $PREFIX$SUFFIX == */* ]]; then + # sect_dirname= + # _wanted manuals expl 'manual page' _man_pages && return + # fi return 1 else @@ -105,9 +112,13 @@ _man_pages() { # Easy way to test for versions of man that allow file names. # This can't be a normal man page reference. # Try to complete by glob first. - _path_files -g "*$suf" && return - _path_files - return + if [[ -n $sect_dirname ]]; then + _path_files -g "*.*$sect_dirname*(|.gz|.bz2|.Z|.lzma)" "$expl[@]" + else + _path_files -g "*$suf" "$expl[@]" && return + _path_files "$expl[@]" + fi + return $? fi zparseopts -E M+:=matcher -- cgit 1.4.1