To: vim_dev@googlegroups.com Subject: Patch 7.4.1904 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1904 (after 7.4.1903) Problem: Build fails. Solution: Add missing changes. Files: src/vim.h *** ../vim-7.4.1903/src/vim.h 2016-06-04 18:49:15.382070039 +0200 --- src/vim.h 2016-06-05 22:32:46.372697060 +0200 *************** *** 1063,1069 **** #define OPENLINE_COM_LIST 16 /* format comments with list/2nd line indent */ /* ! * There are four history tables: */ #define HIST_CMD 0 /* colon commands */ #define HIST_SEARCH 1 /* search commands */ --- 1063,1069 ---- #define OPENLINE_COM_LIST 16 /* format comments with list/2nd line indent */ /* ! * There are five history tables: */ #define HIST_CMD 0 /* colon commands */ #define HIST_SEARCH 1 /* search commands */ *************** *** 1072,1077 **** --- 1072,1097 ---- #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(). */ *** ../vim-7.4.1903/src/version.c 2016-06-06 21:07:48.387578685 +0200 --- src/version.c 2016-06-06 21:19:57.811568652 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1904, /**/ -- ERROR 047: Keyboard not found. Press RETURN to continue. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///