diff --git a/vim/PKGBUILD b/vim/PKGBUILD index 58b2b69a..303b8922 100644 --- a/vim/PKGBUILD +++ b/vim/PKGBUILD @@ -2,7 +2,7 @@ pkgname=vim _topver=8.1 -_patchlevel=0877 +_patchlevel=1234 _versiondir="${pkgname}${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -20,13 +20,13 @@ source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgve 'pretend-cygwin-msys.patch' 'accept-crlf.patch' 'vim-completion') -sha256sums=('e578934722916080aaaf5c05bba62534cd26165bad34d740cca922f8e36eff6b' +sha256sums=('e7d5705157b63d65c641cdd1cab2e6eca249ebc5b6fc3b372f9ea0bcf82e020f' 'edd18e0756406ee7b659e4552e444c50c3a0c1e9fb4fce2ddd770c933ea6c7f5' 'bca6e030d50c0d2468ab5c78aa0b359eb18a88a197de8406c593458ffedde922' '44d7738a8f801195898eeef766ff77506c717dd5d19145ade3c1c2349d4bc4fd' 'f5f56f3e038f1ad1acb657f1c420d6f666573ab24b928d7e7ca6d1c5ac9182cd' '5fcec194d2fcb2a624358d8ce074e8d97b873b5c2fff2118491b57a4880737d9' - 'bfa0b1f29e83eadd161c570f28a1247e3dca6aa3d89d23abcb7e57dab7649a6d' + 'fbc6c051aee3f67b2b703a1d984ee5f8a1dc2bca9ad4f7098be3895ccae833b6' 'bdca6069ef0fa995718f4b59fea85e58629259bb5a385d53e52d162d1463d4ff') prepare() { diff --git a/vim/accept-crlf.patch b/vim/accept-crlf.patch index 5eb1471c..f2239ed7 100644 --- a/vim/accept-crlf.patch +++ b/vim/accept-crlf.patch @@ -23,8 +23,8 @@ index 30f9e9d..c2d6e0f 100644 FILE *fp; /* opened file for sourcing */ char_u *nextline; /* if not NULL: line that was read ahead */ int finished; /* ":finish" used */ --#if defined(USE_CRNL) || defined(USE_CR) -+#if defined(__MSYS__) || defined(USE_CRNL) || defined(USE_CR) +-#ifdef USE_CRNL ++#if defined(__MSYS__) || defined(USE_CRNL) int fileformat; /* EOL_UNKNOWN, EOL_UNIX or EOL_DOS */ int error; /* TRUE if LF found after CR-LF */ #endif @@ -69,10 +69,10 @@ index 0f3f148..016f15d 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5208,7 +5208,7 @@ msg_add_fileformat(eol_type) + STRCAT(IObuff, shortmess(SHM_TEXT) ? _("[mac]") : _("[mac format]")); return TRUE; } - #endif --#if defined(USE_CRNL) || defined(USE_CR) +-#ifdef USE_CRNL +#if defined(__MSYS__) || defined(USE_CRNL) || defined(USE_CR) if (eol_type == EOL_UNIX) {