patch 7.4.1833
Problem: Cannot use an Ex command for 'keywordprg'.
Solution: Accept an Ex command. (Nelo-Thara Wallus)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index aefbdbf..3f37649 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4587,16 +4587,18 @@
*'keywordprg'* *'kp'*
'keywordprg' 'kp' string (default "man" or "man -s", DOS: ":help",
- OS/2: "view /", VMS: "help")
+ VMS: "help")
global or local to buffer |global-local|
{not in Vi}
Program to use for the |K| command. Environment variables are
expanded |:set_env|. ":help" may be used to access the Vim internal
help. (Note that previously setting the global option to the empty
value did this, which is now deprecated.)
- When "man" is used, Vim will automatically translate a count for the
- "K" command to a section number. Also for "man -s", in which case the
- "-s" is removed when there is no count.
+ When the first character is ":", the command is invoked as a Vim
+ Ex command prefixed with [count].
+ When "man", "man -s" or an Ex command is used, Vim will automatically
+ translate a count for the "K" command and pass it as the first
+ argument. For "man -s" the "-s" is removed when there is no count.
See |option-backslash| about including spaces and backslashes.
Example: >
:set keywordprg=man\ -s
diff --git a/src/normal.c b/src/normal.c
index 7c15c15..d9948ec 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5485,10 +5485,12 @@
{
char_u *ptr = NULL;
char_u *buf;
+ unsigned buflen;
char_u *newbuf;
char_u *p;
char_u *kp; /* value of 'keywordprg' */
- int kp_help; /* 'keywordprg' is ":help" */
+ int kp_help; /* 'keywordprg' is ":he" */
+ int kp_ex; /* 'keywordprg' starts with ":" */
int n = 0; /* init for GCC */
int cmdchar;
int g_cmd; /* "g" command */
@@ -5536,7 +5538,9 @@
kp = (*curbuf->b_p_kp == NUL ? p_kp : curbuf->b_p_kp);
kp_help = (*kp == NUL || STRCMP(kp, ":he") == 0
|| STRCMP(kp, ":help") == 0);
- buf = alloc((unsigned)(n * 2 + 30 + STRLEN(kp)));
+ kp_ex = (*kp == ':');
+ buflen = (unsigned)(n * 2 + 30 + STRLEN(kp));
+ buf = alloc(buflen);
if (buf == NULL)
return;
buf[0] = NUL;
@@ -5562,6 +5566,15 @@
case 'K':
if (kp_help)
STRCPY(buf, "he! ");
+ else if (kp_ex)
+ {
+ if (cap->count0 != 0)
+ vim_snprintf((char *)buf, buflen, "%s %ld",
+ kp, cap->count0);
+ else
+ STRCPY(buf, kp);
+ STRCAT(buf, " ");
+ }
else
{
/* An external command will probably use an argument starting
diff --git a/src/version.c b/src/version.c
index 863a58f..eaa3e8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1833,
+/**/
1832,
/**/
1831,
