patch 7.4.1904

Problem:    Build fails.
Solution:   Add missing changes.

diff --git a/src/version.c b/src/version.c
index 82ea5f2b896ebf5a06911814a2c5a7d5e07f17a2..8305e3947b60e9f8fd8084341b6c879ac8990c37 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1904,
 /**/
     1903,
 /**/

diff --git a/src/vim.h b/src/vim.h
index d573cea1ff2bbd0fdab743d4442b1a2cb8a81403..33ed941ca049686c0c7b1dd1fde49e60f5d29c01 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1063,7 +1063,7 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
 #define OPENLINE_COM_LIST  16  /* format comments with list/2nd line indent */
 
 /*
- * There are four history tables:
+ * There are five history tables:
  */
 #define HIST_CMD       0       /* colon commands */
 #define HIST_SEARCH    1       /* search commands */
@@ -1072,6 +1072,26 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
 #define HIST_DEBUG     4       /* debug commands */
 #define HIST_COUNT     5       /* number of history tables */
 
+/* The type numbers are fixed for backwards compatibility. */
+#define BARTYPE_VERSION 1
+#define BARTYPE_HISTORY 2
+
+typedef enum {
+    BVAL_NR,
+    BVAL_STRING,
+    BVAL_EMPTY
+} btype_T;
+
+#define BVAL_MAX 4     /* Maximum number of fields in a barline. */
+
+typedef struct {
+    btype_T    bv_type;
+    long       bv_nr;
+    char_u     *bv_string;
+    int                bv_len;         /* length of bv_string */
+    int                bv_allocated;   /* bv_string was allocated */
+} bval_T;
+
 /*
  * Values for do_tag().
  */