Merge remote-tracking branch 'upstream/master'

src/nvim/option.c

@@ -5718,7 +5718,22 @@ void buf_copy_options(buf_T *buf, int flags)
         free_buf_options(buf, TRUE);
         buf->b_p_ro = FALSE;                    /* don't copy readonly */
         buf->b_p_fenc = vim_strsave(p_fenc);
-        buf->b_p_ff = vim_strsave(p_ff);
+        switch (*p_ffs) {
+        case 'm':
+          buf->b_p_ff = vim_strsave((char_u *)FF_MAC);
+          break;
+        case 'd':
+          buf->b_p_ff = vim_strsave((char_u *)FF_DOS);
+          break;
+        case 'u':
+          buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
+          break;
+        default:
+          buf->b_p_ff = vim_strsave(p_ff);
+        }
+        if (buf->b_p_ff != NULL) {
+          buf->b_start_ffc = *buf->b_p_ff;
+        }
         buf->b_p_bh = empty_option;
         buf->b_p_bt = empty_option;
       } else

src/nvim/testdir/test_alot.vim

@@ -14,6 +14,7 @@ source test_float_func.vim
 source test_functions.vim
 source test_goto.vim
 source test_jumps.vim
+source test_fileformat.vim
 source test_lambda.vim
 source test_menu.vim
 source test_mapping.vim

src/nvim/testdir/test_fileformat.vim

@@ -0,0 +1,17 @@
+" Test behavior of fileformat after bwipeout of last buffer
+
+func Test_fileformat_after_bw()
+  bwipeout
+  set fileformat&
+  if &fileformat == 'dos'
+    let test_fileformats = 'unix'
+  elseif &fileformat == 'unix'
+    let test_fileformats = 'mac'
+  else  " must be mac
+    let test_fileformats = 'dos'
+  endif
+  exec 'set fileformats='.test_fileformats
+  bwipeout!
+  call assert_equal(test_fileformats, &fileformat)
+  set fileformats&
+endfunc

src/nvim/testdir/test_matchadd_conceal.vim

@@ -277,6 +277,7 @@ function! Test_matchadd_and_syn_conceal()
   call assert_notequal(screenattr(1, 11) , screenattr(1, 12))
   call assert_equal(screenattr(1, 11) , screenattr(1, 32))
   call matchadd('CheckedByCoq', '\%<2l\%>9c\%<16c')
+  redraw!
   call assert_equal(expect, s:screenline(1))
   call assert_notequal(screenattr(1, 10) , screenattr(1, 11))
   call assert_notequal(screenattr(1, 11) , screenattr(1, 12))

src/nvim/version.c

@@ -677,7 +677,7 @@ static const int included_patches[] = {
   // 55 NA
   // 54 NA
   53,
-  // 52,
+  52,
   // 51 NA
   // 50 NA
   49,
@@ -691,14 +691,14 @@ static const int included_patches[] = {
   41,
   40,
   // 39 NA
-  // 38,
+  38,
   37,
   // 36 NA
   35,
   // 34,
   33,
   32,
-  // 31,
+  31,
   // 30 NA
   // 29 NA
   // 28 NA

src/nvim/vim.h

@@ -319,7 +319,7 @@ enum { FOLD_TEXT_LEN = 51 };  //!< buffer size for get_foldtext()
 // Lowest number used for window ID. Cannot have this many windows per tab.
 #define LOWEST_WIN_ID 1000
 
-#if defined(__FreeBSD__) && defined(S_ISCHR)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(S_ISCHR)
 # define OPEN_CHR_FILES
 #endif