Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 3(a)/3] _man: Support _correct_word.
- X-seq: zsh-workers 38995
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH 3(a)/3] _man: Support _correct_word.
- Date: Thu, 4 Aug 2016 15:54:25 +0000
- In-reply-to: <1470326066-3241-1-git-send-email-danielsh@tarsus.local2>
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- References: <1470326066-3241-1-git-send-email-danielsh@tarsus.local2>
The 'compfiles' call in «man 8 foo<TAB>» resulted in glob patterns of the form
«.../foo*», so the would-be targets of spelling correction would not have been
provided to the completion code by the globbing code.
Fix this by mimicking the only other callsite of compfiles, _path_files, which
passes a flag (${_comp_correct:+"-"}) that is only set by _approximate and
causes cfp_opt_pats() to be skipped. This enables spelling correction to work,
however, it is unknown what side effects it may have.
---
Completion/Unix/Command/_man | 2 +-
Src/Zle/computil.c | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man
index ffe53be..3900cba 100644
--- a/Completion/Unix/Command/_man
+++ b/Completion/Unix/Command/_man
@@ -131,7 +131,7 @@ _man_pages() {
fi
pages=( ${(M)dirs:#*$sect_dirname/} )
- compfiles -p pages '' '' "$matcher" '' dummy "*${sect}*"
+ compfiles -p${_comp_correct:+"-"} pages '' '' "$matcher" '' dummy "*${sect}*"
pages=( ${^~pages}(N:t) )
(($#mrd)) && pages[$#pages+1]=($(awk $awk $mrd))
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index e8f0a6f..0028ac1 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -4480,6 +4480,10 @@ cfp_matcher_pats(char *matcher, char *add)
return add;
}
+/*
+ * ### This function call is skipped by _approximate, so "opt" probably means "optimize".
+ */
+
static void
cfp_opt_pats(char **pats, char *matcher)
{
@@ -4811,6 +4815,17 @@ cf_remove_other(char **names, char *pre, int *amb)
return NULL;
}
+/*
+ * SYNOPSIS:
+ * 1. compfiles -p parnam1 parnam2 skipped matcher sdirs parnam3 varargs [..varargs]
+ * 2. compfiles -p- parnam1 parnam2 skipped matcher sdirs parnam3 varargs [..varargs]
+ * 3. compfiles -P parnam1 parnam2 skipped matcher sdirs parnam3
+ *
+ * 1. Set parnam1 to an array of patterns....
+ * 2. Like #1 but without calling cfp_opt_pats(). (This is only used by _approximate.)
+ * 3. Like #1 but varargs is implicitly set to char *varargs[2] = { "*(-/)", NULL };.
+ */
+
static int
bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
{
Messages sorted by:
Reverse Date,
Date,
Thread,
Author