Mercurial > vim
comparison src/vim.h @ 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 | ba592f30c082 |
children | eda4d65f232c |
comparison
equal
deleted
inserted
replaced
16737:e56018f01ba7 | 16738:b52ea9c5f1db |
---|---|
779 #define WILD_SILENT 0x40 | 779 #define WILD_SILENT 0x40 |
780 #define WILD_ESCAPE 0x80 | 780 #define WILD_ESCAPE 0x80 |
781 #define WILD_ICASE 0x100 | 781 #define WILD_ICASE 0x100 |
782 #define WILD_ALLLINKS 0x200 | 782 #define WILD_ALLLINKS 0x200 |
783 | 783 |
784 /* Flags for expand_wildcards() */ | 784 // Flags for expand_wildcards() |
785 #define EW_DIR 0x01 /* include directory names */ | 785 #define EW_DIR 0x01 // include directory names |
786 #define EW_FILE 0x02 /* include file names */ | 786 #define EW_FILE 0x02 // include file names |
787 #define EW_NOTFOUND 0x04 /* include not found names */ | 787 #define EW_NOTFOUND 0x04 // include not found names |
788 #define EW_ADDSLASH 0x08 /* append slash to directory name */ | 788 #define EW_ADDSLASH 0x08 // append slash to directory name |
789 #define EW_KEEPALL 0x10 /* keep all matches */ | 789 #define EW_KEEPALL 0x10 // keep all matches |
790 #define EW_SILENT 0x20 /* don't print "1 returned" from shell */ | 790 #define EW_SILENT 0x20 // don't print "1 returned" from shell |
791 #define EW_EXEC 0x40 /* executable files */ | 791 #define EW_EXEC 0x40 // executable files |
792 #define EW_PATH 0x80 /* search in 'path' too */ | 792 #define EW_PATH 0x80 // search in 'path' too |
793 #define EW_ICASE 0x100 /* ignore case */ | 793 #define EW_ICASE 0x100 // ignore case |
794 #define EW_NOERROR 0x200 /* no error for bad regexp */ | 794 #define EW_NOERROR 0x200 // no error for bad regexp |
795 #define EW_NOTWILD 0x400 /* add match with literal name if exists */ | 795 #define EW_NOTWILD 0x400 // add match with literal name if exists |
796 #define EW_KEEPDOLLAR 0x800 /* do not escape $, $var is expanded */ | 796 #define EW_KEEPDOLLAR 0x800 // do not escape $, $var is expanded |
797 /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND | 797 // Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND |
798 * is used when executing commands and EW_SILENT for interactive expanding. */ | 798 // is used when executing commands and EW_SILENT for interactive expanding. |
799 #define EW_ALLLINKS 0x1000 /* also links not pointing to existing file */ | 799 #define EW_ALLLINKS 0x1000 // also links not pointing to existing file |
800 #define EW_SHELLCMD 0x2000 /* called from expand_shellcmd(), don't check | 800 #define EW_SHELLCMD 0x2000 // called from expand_shellcmd(), don't check |
801 * if executable is in $PATH */ | 801 // if executable is in $PATH |
802 #define EW_DODOT 0x4000 /* also files starting with a dot */ | 802 #define EW_DODOT 0x4000 // also files starting with a dot |
803 #define EW_EMPTYOK 0x8000 /* no matches is not an error */ | 803 #define EW_EMPTYOK 0x8000 // no matches is not an error |
804 #define EW_NOTENV 0x10000 // do not expand environment variables | |
804 | 805 |
805 /* Flags for find_file_*() functions. */ | 806 /* Flags for find_file_*() functions. */ |
806 #define FINDFILE_FILE 0 /* only files */ | 807 #define FINDFILE_FILE 0 /* only files */ |
807 #define FINDFILE_DIR 1 /* only directories */ | 808 #define FINDFILE_DIR 1 /* only directories */ |
808 #define FINDFILE_BOTH 2 /* files and directories */ | 809 #define FINDFILE_BOTH 2 /* files and directories */ |