summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 661fba6c7..2f0f1f4d3 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5546,7 +5546,7 @@ ex_help(eap)
}
arg = eap->arg;
- if (eap->forceit && *arg == NUL)
+ if (eap->forceit && *arg == NUL && !curbuf->b_help)
{
EMSG(_("E478: Don't panic!"));
return;
diff --git a/src/version.c b/src/version.c
index ba2b03045..8bcdd3075 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 488,
+/**/
487,
/**/
486,