To: vim_dev@googlegroups.com Subject: Patch 8.2.2478 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2478 Problem: MS-Windows: backup files for plugins are loaded. Solution: Do not use the alternate file name for files ending in "~". Files: src/filepath.c *** ../vim-8.2.2477/src/filepath.c 2021-01-13 20:37:44.439646243 +0100 --- src/filepath.c 2021-02-07 14:00:13.341214556 +0100 *************** *** 3360,3366 **** if (p == NULL) break; // out of memory ! if (*wfb.cAlternateFileName == NUL) p_alt = NULL; else p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL); --- 3360,3369 ---- if (p == NULL) break; // out of memory ! // Do not use the alternate filename when the file name ends in '~', ! // because it picks up backup files: short name for "foo.vim~" is ! // "foo~1.vim", which matches "*.vim". ! if (*wfb.cAlternateFileName == NUL || p[STRLEN(p) - 1] == '~') p_alt = NULL; else p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL); *** ../vim-8.2.2477/src/version.c 2021-02-07 13:32:42.602587161 +0100 --- src/version.c 2021-02-07 14:01:17.632979425 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2478, /**/ -- GUARD #1: What, ridden on a horse? ARTHUR: Yes! GUARD #1: You're using coconuts! ARTHUR: What? GUARD #1: You've got two empty halves of coconut and you're bangin' 'em together. The Quest for the Holy Grail (Monty Python) /// 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 ///