Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Qmail-Scanner-Diagnostics: from hermes.apache.org by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(140.211.11.3):SA:0(-1.3/5.0):. Processed in 0.141456 secs); 04 Aug 2016 15:54:37 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: danielsh@apache.org X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at apache.org does not designate permitted sender hosts) From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 3(b)/3] _man: Support _correct_word. Date: Thu, 4 Aug 2016 15:54:26 +0000 Message-Id: <1470326066-3241-5-git-send-email-danielsh@tarsus.local2> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1470326066-3241-1-git-send-email-danielsh@tarsus.local2> References: <1470326066-3241-1-git-send-email-danielsh@tarsus.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Seq: zsh-workers 38996 Since compfiles is undocumented, avoid its use altogether, replacing it by a construct that blackbox analysis suggests to be equivalent. The compfiles call being removed effected the following change (when completing «man -S 8:1 getc»): BEFORE THE CALL: typeset -a pages=( /home/daniel/prefix/zsh/share/man/man1/ /usr/share/man/man8/ /usr/share/man/man1/ ) AFTER THE CALL: typeset -a pages=( '/home/daniel/prefix/zsh/share/man/man1/getc*(8|1)*' '/usr/share/man/man8/getc*(8|1)*' '/usr/share/man/man1/getc*(8|1)*' ) This patch effects the same transformation (modulo doubling the final slash). Any -M parameter will be passed to compadd. --- Completion/Unix/Command/_man | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man index ffe53be..ae6ac38 100644 --- a/Completion/Unix/Command/_man +++ b/Completion/Unix/Command/_man @@ -103,7 +103,7 @@ _man() { } _man_pages() { - local matcher pages dummy sopt + local pages sopt # What files corresponding to manual pages can end in. local suf='.((?|<->*)(|.gz|.bz2|.Z|.lzma))' @@ -121,17 +121,8 @@ _man_pages() { return $? fi - zparseopts -E M+:=matcher - - if (( $#matcher )); then - matcher=( ${matcher:#-M} ) - matcher="$matcher" - else - matcher= - fi - pages=( ${(M)dirs:#*$sect_dirname/} ) - compfiles -p pages '' '' "$matcher" '' dummy "*${sect}*" + pages=( ${^pages}/"*$sect${sect:+"*"}" ); pages=( ${^~pages}(N:t) ) (($#mrd)) && pages[$#pages+1]=($(awk $awk $mrd))