To: vim_dev@googlegroups.com
Subject: Patch 8.0.1363
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.0.1363
Problem:    Recovering does not work when swap file ends in .stz.
Solution:   Check for all possible swap file names. (Elfling, closes #2395,
            closes #2396)
Files:      src/memline.c


*** ../vim-8.0.1362/src/memline.c	2017-09-16 20:54:47.106560363 +0200
--- src/memline.c	2017-12-02 15:07:20.506745932 +0100
***************
*** 1139,1145 ****
      attr = HL_ATTR(HLF_E);
  
      /*
!      * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
       * Otherwise a search is done to find the swap file(s).
       */
      fname = curbuf->b_fname;
--- 1139,1145 ----
      attr = HL_ATTR(HLF_E);
  
      /*
!      * If the file name ends in ".s[a-w][a-z]" we assume this is the swap file.
       * Otherwise a search is done to find the swap file(s).
       */
      fname = curbuf->b_fname;
***************
*** 1153,1159 ****
  	    STRNICMP(fname + len - 4, ".s", 2)
  #endif
  						== 0
! 		&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
  		&& ASCII_ISALPHA(fname[len - 1]))
      {
  	directly = TRUE;
--- 1153,1160 ----
  	    STRNICMP(fname + len - 4, ".s", 2)
  #endif
  						== 0
! 		&& vim_strchr((char_u *)"abcdefghijklmnopqrstuvw",
! 					   TOLOWER_ASC(fname[len - 2])) != NULL
  		&& ASCII_ISALPHA(fname[len - 1]))
      {
  	directly = TRUE;
*** ../vim-8.0.1362/src/version.c	2017-12-01 21:07:16.224989882 +0100
--- src/version.c	2017-12-02 15:10:27.773891926 +0100
***************
*** 773,774 ****
--- 773,776 ----
  {   /* Add new patch number below this line */
+ /**/
+     1363,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
60. As your car crashes through the guardrail on a mountain road, your first
    instinct is to search for the "back" button.

 /// 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    ///