summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-27 20:52:45 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-27 20:52:45 +0100
commit2d9d409ad4fab1ae7ceaecc0ef0e9b511d868374 (patch)
tree076fa03ebd2d8fd063cc5315e1b45ef556cb2c09
parent191acfdecabfbd2a74867e77004196fb3b4a8c14 (diff)
patch 8.2.0464: typos and other small problemsv8.2.0463
Problem: Typos and other small problems. Solution: Fix the typos. Add missing file to distribution.
-rw-r--r--src/evalfunc.c4
-rw-r--r--src/globals.h2
-rw-r--r--src/version.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index b37dbb3810..5f290aa69e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -280,13 +280,11 @@ ret_number(int argcount UNUSED, type_T **argtypes UNUSED)
{
return &t_number;
}
-#ifdef FEAT_FLOAT
static type_T *
ret_float(int argcount UNUSED, type_T **argtypes UNUSED)
{
return &t_float;
}
-#endif
static type_T *
ret_string(int argcount UNUSED, type_T **argtypes UNUSED)
{
@@ -336,7 +334,6 @@ ret_partial_void(int argcount UNUSED, type_T **argtypes UNUSED)
{
return &t_partial_void;
}
-#ifdef FEAT_JOB_CHANNEL
static type_T *
ret_channel(int argcount UNUSED, type_T **argtypes UNUSED)
{
@@ -347,7 +344,6 @@ ret_job(int argcount UNUSED, type_T **argtypes UNUSED)
{
return &t_job;
}
-#endif
static type_T *ret_f_function(int argcount, type_T **argtypes);
diff --git a/src/globals.h b/src/globals.h
index 6d3fa1670a..f1538d6225 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -384,9 +384,7 @@ EXTERN type_T t_void INIT4(VAR_VOID, 0, NULL, NULL);
EXTERN type_T t_bool INIT4(VAR_BOOL, 0, NULL, NULL);
EXTERN type_T t_special INIT4(VAR_SPECIAL, 0, NULL, NULL);
EXTERN type_T t_number INIT4(VAR_NUMBER, 0, NULL, NULL);
-# ifdef FEAT_FLOAT
EXTERN type_T t_float INIT4(VAR_FLOAT, 0, NULL, NULL);
-# endif
EXTERN type_T t_string INIT4(VAR_STRING, 0, NULL, NULL);
EXTERN type_T t_blob INIT4(VAR_BLOB, 0, NULL, NULL);
EXTERN type_T t_job INIT4(VAR_JOB, 0, NULL, NULL);
diff --git a/src/version.c b/src/version.c
index 46fd076446..752044cfda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 463,
+/**/
+ 462,
+/**/
462,
/**/
461,