Mercurial > vim
comparison src/gui.c @ 16738:b52ea9c5f1db v8.1.1371
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 | 47a8b29f289c |
children | ef00b6bc186b |
comparison
equal
deleted
inserted
replaced
16737:e56018f01ba7 | 16738:b52ea9c5f1db |
---|---|
601 #else | 601 #else |
602 secure = p_secure; | 602 secure = p_secure; |
603 #endif | 603 #endif |
604 | 604 |
605 if ( fullpathcmp((char_u *)USR_GVIMRC_FILE, | 605 if ( fullpathcmp((char_u *)USR_GVIMRC_FILE, |
606 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME | 606 (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME |
607 #ifdef SYS_GVIMRC_FILE | 607 #ifdef SYS_GVIMRC_FILE |
608 && fullpathcmp((char_u *)SYS_GVIMRC_FILE, | 608 && fullpathcmp((char_u *)SYS_GVIMRC_FILE, |
609 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME | 609 (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME |
610 #endif | 610 #endif |
611 #ifdef USR_GVIMRC_FILE2 | 611 #ifdef USR_GVIMRC_FILE2 |
612 && fullpathcmp((char_u *)USR_GVIMRC_FILE2, | 612 && fullpathcmp((char_u *)USR_GVIMRC_FILE2, |
613 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME | 613 (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME |
614 #endif | 614 #endif |
615 #ifdef USR_GVIMRC_FILE3 | 615 #ifdef USR_GVIMRC_FILE3 |
616 && fullpathcmp((char_u *)USR_GVIMRC_FILE3, | 616 && fullpathcmp((char_u *)USR_GVIMRC_FILE3, |
617 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME | 617 (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME |
618 #endif | 618 #endif |
619 #ifdef USR_GVIMRC_FILE4 | 619 #ifdef USR_GVIMRC_FILE4 |
620 && fullpathcmp((char_u *)USR_GVIMRC_FILE4, | 620 && fullpathcmp((char_u *)USR_GVIMRC_FILE4, |
621 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME | 621 (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME |
622 #endif | 622 #endif |
623 ) | 623 ) |
624 do_source((char_u *)GVIMRC_FILE, TRUE, DOSO_GVIMRC); | 624 do_source((char_u *)GVIMRC_FILE, TRUE, DOSO_GVIMRC); |
625 | 625 |
626 if (secure == 2) | 626 if (secure == 2) |