• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisionf33098f1aec0bd83427ec831548239ab3fe76d1d (tree)
Zeit2020-04-07 07:01:14
AutorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

patch 8.2.0525: Win32: typo in assignment and misplaced paren

Commit: https://github.com/vim/vim/commit/40655d501649e0b73e12f940b56f462dee44e06c
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Apr 6 23:49:50 2020 +0200

patch 8.2.0525: Win32: typo in assignment and misplaced paren
Problem: Win32: typo in assignment and misplaced paren.
Solution: Fix the syntax.

Ändern Zusammenfassung

Diff

diff -r 87711a925c87 -r f33098f1aec0 src/filepath.c
--- a/src/filepath.c Mon Apr 06 23:00:30 2020 +0200
+++ b/src/filepath.c Tue Apr 07 00:01:14 2020 +0200
@@ -3168,7 +3168,7 @@
31683168 break; // out of memory
31693169
31703170 if (*wfb.cAlternateFileName == NUL)
3171- p_alt == NULL;
3171+ p_alt = NULL;
31723172 else
31733173 p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL);
31743174
@@ -3179,10 +3179,9 @@
31793179 && p[1] != NUL && (p[1] != '.' || p[2] != NUL)))
31803180 && (matchname == NULL
31813181 || (regmatch.regprog != NULL
3182- && (vim_regexec(&regmatch, p, (colnr_T)0)
3182+ && (vim_regexec(&regmatch, p, (colnr_T)0)
31833183 || (p_alt != NULL
3184- && vim_regexec(&regmatch, p_alt, (colnr_T)0)))
3185- ))
3184+ && vim_regexec(&regmatch, p_alt, (colnr_T)0))))
31863185 || ((flags & EW_NOTWILD)
31873186 && fnamencmp(path + (s - buf), p, e - s) == 0)))
31883187 {
diff -r 87711a925c87 -r f33098f1aec0 src/version.c
--- a/src/version.c Mon Apr 06 23:00:30 2020 +0200
+++ b/src/version.c Tue Apr 07 00:01:14 2020 +0200
@@ -739,6 +739,8 @@
739739 static int included_patches[] =
740740 { /* Add new patch number below this line */
741741 /**/
742+ 525,
743+/**/
742744 524,
743745 /**/
744746 523,
Show on old repository browser