To: vim_dev@googlegroups.com Subject: Patch 8.1.0953 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0953 Problem: A very long file is truncated at 2^31 lines. Solution: Use LONG_MAX for MAXLNUM. (Dominique Pelle, closes #4011) Files: src/vim.h *** ../vim-8.1.0952/src/vim.h 2019-02-18 21:41:34.477750367 +0100 --- src/vim.h 2019-02-19 21:24:24.887720755 +0100 *************** *** 54,59 **** --- 54,62 ---- Error: configure did not run properly. Check auto/config.log. # endif + // for INT_MAX, LONG_MAX et al. + #include + /* * Cygwin may have fchdir() in a newer release, but in most versions it * doesn't work well and avoiding it keeps the binary backward compatible. *************** *** 455,463 **** # include #endif - /* for INT_MAX et al. */ - #include - /* * Allow other (non-unix) systems to configure themselves now * These are also in os_unix.h, because osdef.sh needs them there. --- 458,463 ---- *************** *** 1666,1682 **** * not a real problem. BTW: Longer lines are split. */ #ifdef __MVS__ ! # define MAXCOL (0x3fffffffL) /* maximum column number, 30 bits */ ! # define MAXLNUM (0x3fffffffL) /* maximum (invalid) line number */ #else ! # define MAXCOL (0x7fffffffL) /* maximum column number, 31 bits */ ! # define MAXLNUM (0x7fffffffL) /* maximum (invalid) line number */ #endif ! #define SHOWCMD_COLS 10 /* columns needed by shown command */ ! #define STL_MAX_ITEM 80 /* max nr of % in statusline */ ! typedef void *vim_acl_T; /* dummy to pass an ACL to a function */ #ifndef mch_memmove # define mch_memmove(to, from, len) memmove((char*)(to), (char*)(from), (size_t)(len)) --- 1666,1682 ---- * not a real problem. BTW: Longer lines are split. */ #ifdef __MVS__ ! # define MAXCOL (0x3fffffffL) // maximum column number, 30 bits ! # define MAXLNUM (0x3fffffffL) // maximum (invalid) line number #else ! # define MAXCOL INT_MAX // maximum column number ! # define MAXLNUM LONG_MAX // maximum (invalid) line number #endif ! #define SHOWCMD_COLS 10 // columns needed by shown command ! #define STL_MAX_ITEM 80 // max nr of % in statusline ! typedef void *vim_acl_T; // dummy to pass an ACL to a function #ifndef mch_memmove # define mch_memmove(to, from, len) memmove((char*)(to), (char*)(from), (size_t)(len)) *** ../vim-8.1.0952/src/version.c 2019-02-18 22:19:29.124186022 +0100 --- src/version.c 2019-02-19 21:19:41.165686811 +0100 *************** *** 781,782 **** --- 781,784 ---- { /* Add new patch number below this line */ + /**/ + 953, /**/ -- It doesn't really matter what you are able to do if you don't do it. (Bram Moolenaar) /// 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 ///