3 files changed, 79 insertions, 12 deletions

diff --git a/src/nvim/generators/gen_char_blob.lua b/src/nvim/generators/gen_char_blob.lua
index 70c034abc5..3ec1ff2caf 100644
--- a/src/nvim/generators/gen_char_blob.lua
+++ b/src/nvim/generators/gen_char_blob.lua
@@ -28,6 +28,7 @@ local target = io.open(target_file, 'w')
 
 target:write('#include <stdint.h>\n\n')
 
+local warn_on_missing_compiler = true
 local varnames = {}
 for argi = 2, #arg, 2 do
   local source_file = arg[argi]
@@ -42,10 +43,11 @@ for argi = 2, #arg, 2 do
   local output
   if options.c then
     local luac = os.getenv("LUAC_PRG")
-    if luac then
+    if luac and luac ~= "" then
       output = io.popen(luac:format(source_file), "r"):read("*a")
-    else
-      print("LUAC_PRG is undefined")
+    elseif warn_on_missing_compiler then
+      print("LUAC_PRG is missing, embedding raw source")
+      warn_on_missing_compiler = false
     end
   end
 
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 7ed9c68c96..dbe0cd8388 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -1004,4 +1004,44 @@ func Test_fs_file()
   filetype off
 endfunc
 
+func Test_dep3patch_file()
+  filetype on
+
+  call assert_true(mkdir('debian/patches', 'p'))
+
+  " series files are not patches
+  call writefile(['Description: some awesome patch'], 'debian/patches/series')
+  split debian/patches/series
+  call assert_notequal('dep3patch', &filetype)
+  bwipe!
+
+  " diff/patch files without the right headers should still show up as ft=diff
+  call writefile([], 'debian/patches/foo.diff')
+  split debian/patches/foo.diff
+  call assert_equal('diff', &filetype)
+  bwipe!
+
+  " Files with the right headers are detected as dep3patch, even if they don't
+  " have a diff/patch extension
+  call writefile(['Subject: dep3patches'], 'debian/patches/bar')
+  split debian/patches/bar
+  call assert_equal('dep3patch', &filetype)
+  bwipe!
+
+  " Files in sub-directories are detected
+  call assert_true(mkdir('debian/patches/s390x', 'p'))
+  call writefile(['Subject: dep3patches'], 'debian/patches/s390x/bar')
+  split debian/patches/s390x/bar
+  call assert_equal('dep3patch', &filetype)
+  bwipe!
+
+  " The detection stops when seeing the "header end" marker
+  call writefile(['---', 'Origin: the cloud'], 'debian/patches/baz')
+  split debian/patches/baz
+  call assert_notequal('dep3patch', &filetype)
+  bwipe!
+
+  call delete('debian/patches', 'rf')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index bb75286369..e7a60aca49 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -308,23 +308,39 @@ static void terminfo_start(UI *ui)
   // Enable bracketed paste
   unibi_out_ext(ui, data->unibi_ext.enable_bracketed_paste);
 
+  int ret;
   uv_loop_init(&data->write_loop);
   if (data->out_isatty) {
-    uv_tty_init(&data->write_loop, &data->output_handle.tty, data->out_fd, 0);
+    ret = uv_tty_init(&data->write_loop, &data->output_handle.tty, data->out_fd, 0);
+    if (ret) {
+      ELOG("uv_tty_init failed: %s", uv_strerror(ret));
+    }
 #ifdef WIN32
-    uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW);
+    ret = uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_RAW);
+    if (ret) {
+      ELOG("uv_tty_set_mode failed: %s", uv_strerror(ret));
+    }
 #else
     int retry_count = 10;
     // A signal may cause uv_tty_set_mode() to fail (e.g., SIGCONT). Retry a
     // few times. #12322
-    while (uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO) == UV_EINTR
+    while ((ret = uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO)) == UV_EINTR
            && retry_count > 0) {
       retry_count--;
     }
+    if (ret) {
+      ELOG("uv_tty_set_mode failed: %s", uv_strerror(ret));
+    }
 #endif
   } else {
-    uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0);
-    uv_pipe_open(&data->output_handle.pipe, data->out_fd);
+    ret = uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0);
+    if (ret) {
+      ELOG("uv_pipe_init failed: %s", uv_strerror(ret));
+    }
+    ret = uv_pipe_open(&data->output_handle.pipe, data->out_fd);
+    if (ret) {
+      ELOG("uv_pipe_open failed: %s", uv_strerror(ret));
+    }
   }
   flush_buf(ui);
 }
@@ -1086,8 +1102,14 @@ static void tui_mode_change(UI *ui, String mode, Integer mode_idx)
   // after calling uv_tty_set_mode. So, set the mode of the TTY again here.
   // #13073
   if (data->is_starting && data->input.in_fd == STDERR_FILENO) {
-    uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_NORMAL);
-    uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO);
+    int ret = uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_NORMAL);
+    if (ret) {
+      ELOG("uv_tty_set_mode failed: %s", uv_strerror(ret));
+    }
+    ret = uv_tty_set_mode(&data->output_handle.tty, UV_TTY_MODE_IO);
+    if (ret) {
+      ELOG("uv_tty_set_mode failed: %s", uv_strerror(ret));
+    }
   }
 #endif
   tui_set_mode(ui, (ModeShape)mode_idx);
@@ -2081,8 +2103,11 @@ static void flush_buf(UI *ui)
       fwrite(bufs[i].base, bufs[i].len, 1, data->screenshot);
     }
   } else {
-    uv_write(&req, STRUCT_CAST(uv_stream_t, &data->output_handle),
-             bufs, (unsigned)(bufp - bufs), NULL);
+    int ret = uv_write(&req, STRUCT_CAST(uv_stream_t, &data->output_handle),
+                       bufs, (unsigned)(bufp - bufs), NULL);
+    if (ret) {
+      ELOG("uv_write failed: %s", uv_strerror(ret));
+    }
     uv_run(&data->write_loop, UV_RUN_DEFAULT);
   }
   data->bufpos = 0;