Mercurial > vim

comparison src/spellfile.c @ 16738:b52ea9c5f1db v8.1.1371

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1371: cannot recover from a swap file commit https://github.com/vim/vim/commit/99499b1c05f85f83876b828eea3f6e14f0f407b4 Author: Bram Moolenaar <Bram@vim.org> Date: Thu May 23 21:35:48 2019 +0200 patch 8.1.1371: cannot recover from a swap file Problem: Cannot recover from a swap file. Solution: Do not expand environment variables in the swap file name. Do not check the extension when we already know a file is a swap file. (Ken Takata, closes 4415, closes #4369)
author Bram Moolenaar <Bram@vim.org>
date Thu, 23 May 2019 21:45:07 +0200
parents 7e733046db1d
children ef00b6bc186b
comparison
equal deleted inserted replaced
16737:e56018f01ba7 16738:b52ea9c5f1db
1732 slang_T *slang; 1732 slang_T *slang;
1733 int didit = FALSE; 1733 int didit = FALSE;
1734 1734
1735 for (slang = first_lang; slang != NULL; slang = slang->sl_next) 1735 for (slang = first_lang; slang != NULL; slang = slang->sl_next)
1736 { 1736 {
1737 if (fullpathcmp(fname, slang->sl_fname, FALSE) == FPC_SAME) 1737 if (fullpathcmp(fname, slang->sl_fname, FALSE, TRUE) == FPC_SAME)
1738 { 1738 {
1739 slang_clear(slang); 1739 slang_clear(slang);
1740 if (spell_load_file(fname, NULL, slang, FALSE) == NULL) 1740 if (spell_load_file(fname, NULL, slang, FALSE) == NULL)
1741 /* reloading failed, clear the language */ 1741 /* reloading failed, clear the language */
1742 slang_clear(slang); 1742 slang_clear(slang);
5438 * pointer-linked version of the trie. And it avoids having two versions 5438 * pointer-linked version of the trie. And it avoids having two versions
5439 * of the code for the soundfolding stuff. 5439 * of the code for the soundfolding stuff.
5440 * It might have been done already by spell_reload_one(). 5440 * It might have been done already by spell_reload_one().
5441 */ 5441 */
5442 for (slang = first_lang; slang != NULL; slang = slang->sl_next) 5442 for (slang = first_lang; slang != NULL; slang = slang->sl_next)
5443 if (fullpathcmp(wfname, slang->sl_fname, FALSE) == FPC_SAME) 5443 if (fullpathcmp(wfname, slang->sl_fname, FALSE, TRUE) == FPC_SAME)
5444 break; 5444 break;
5445 if (slang == NULL) 5445 if (slang == NULL)
5446 { 5446 {
5447 spell_message(spin, (char_u *)_("Reading back spell file...")); 5447 spell_message(spin, (char_u *)_("Reading back spell file..."));
5448 slang = spell_load_file(wfname, NULL, NULL, FALSE); 5448 slang = spell_load_file(wfname, NULL, NULL, FALSE);