Merge branch 'aucmd_textputpost' into 20230125_mix20230125_mix

63 files changed, 1738 insertions, 1258 deletions

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 2361210e59..7b56af59da 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -22,17 +22,15 @@ find_package(TreeSitter REQUIRED)
 target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${TreeSitter_INCLUDE_DIRS})
 target_link_libraries(main_lib INTERFACE ${TreeSitter_LIBRARIES})
 
-find_package(UNIBILIUM 2.0 REQUIRED)
-target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${UNIBILIUM_INCLUDE_DIRS})
-target_link_libraries(main_lib INTERFACE ${UNIBILIUM_LIBRARIES})
+find_package(unibilium 2.0 REQUIRED)
+target_link_libraries(main_lib INTERFACE unibilium)
 
 find_package(LibTermkey 0.22 REQUIRED)
 target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBTERMKEY_INCLUDE_DIRS})
 target_link_libraries(main_lib INTERFACE ${LIBTERMKEY_LIBRARIES})
 
-find_package(LIBVTERM 0.3 REQUIRED)
-target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBVTERM_INCLUDE_DIRS})
-target_link_libraries(main_lib INTERFACE ${LIBVTERM_LIBRARIES})
+find_package(libvterm 0.3 REQUIRED)
+target_link_libraries(main_lib INTERFACE libvterm)
 
 find_package(Iconv REQUIRED)
 target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${Iconv_INCLUDE_DIRS})
@@ -54,7 +52,7 @@ if(PREFER_LUA)
   find_package(Lua 5.1 EXACT REQUIRED)
   target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR})
   target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES})
-  # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped.
+  # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped.
   find_package(LuaJit)
 else()
   find_package(LuaJit REQUIRED)
@@ -175,24 +173,6 @@ if(CI_BUILD)
   endif()
 endif()
 
-list(APPEND CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
-list(APPEND CMAKE_REQUIRED_LIBRARIES "${UNIBILIUM_LIBRARIES}")
-check_c_source_compiles("
-#include <unibilium.h>
-
-int
-main(void)
-{
-  unibi_str_from_var(unibi_var_from_str(\"\"));
-  return unibi_num_from_var(unibi_var_from_num(0));
-}
-" UNIBI_HAS_VAR_FROM)
-list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
-list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${UNIBILIUM_LIBRARIES}")
-if(UNIBI_HAS_VAR_FROM)
-  target_compile_definitions(main_lib INTERFACE NVIM_UNIBI_HAS_VAR_FROM)
-endif()
-
 list(APPEND CMAKE_REQUIRED_INCLUDES "${MSGPACK_INCLUDE_DIRS}")
 check_c_source_compiles("
 #include <msgpack.h>
@@ -699,6 +679,14 @@ if(UNIX)
   endif()
 endif()
 
+if(NOT LUAJIT_FOUND)
+  message(STATUS "luajit not found, skipping unit tests")
+elseif(CMAKE_BUILD_TYPE MATCHES Debug)
+  glob_wrapper(UNIT_TEST_FIXTURES ${PROJECT_SOURCE_DIR}/test/unit/fixtures/*.c)
+  list(APPEND NVIM_SOURCES ${UNIT_TEST_FIXTURES})
+  target_compile_definitions(main_lib INTERFACE UNIT_TESTING)
+endif()
+
 target_sources(nvim PRIVATE ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
   ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_HEADERS}
   ${EXTERNAL_SOURCES} ${EXTERNAL_HEADERS})
@@ -857,27 +845,6 @@ set_target_properties(
 target_compile_definitions(libnvim PRIVATE MAKE_LIB)
 target_link_libraries(libnvim PRIVATE main_lib PUBLIC libuv_lib)
 
-if(NOT LUAJIT_FOUND)
-  message(STATUS "luajit not found, skipping nvim-test (unit tests) target")
-else()
-  glob_wrapper(UNIT_TEST_FIXTURES ${PROJECT_SOURCE_DIR}/test/unit/fixtures/*.c)
-  add_library(
-    nvim-test
-    MODULE
-    EXCLUDE_FROM_ALL
-    ${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES}
-    ${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
-    ${EXTERNAL_SOURCES} ${EXTERNAL_HEADERS}
-    ${UNIT_TEST_FIXTURES}
-  )
-  target_link_libraries(nvim-test PRIVATE ${LUAJIT_LIBRARIES} main_lib PUBLIC libuv_lib)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    target_link_libraries(nvim-test PRIVATE "-framework CoreServices")
-  endif()
-  target_include_directories(nvim-test PRIVATE ${LUAJIT_INCLUDE_DIRS})
-  target_compile_definitions(nvim-test PRIVATE UNIT_TESTING)
-endif()
-
 if(CLANG_ASAN_UBSAN)
   message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.")
   if(CI_BUILD)
diff --git a/src/nvim/api/autocmd.c b/src/nvim/api/autocmd.c
index 931363e199..a2cb297b15 100644
--- a/src/nvim/api/autocmd.c
+++ b/src/nvim/api/autocmd.c
@@ -404,7 +404,7 @@ cleanup:
 ///                 - match: (string) expanded value of |<amatch>|
 ///                 - buf: (number) expanded value of |<abuf>|
 ///                 - file: (string) expanded value of |<afile>|
-///                 - data: (any) arbitrary data passed to |nvim_exec_autocmds()|
+///                 - data: (any) arbitrary data passed from |nvim_exec_autocmds()|
 ///             - command (string) optional: Vim command to execute on event. Cannot be used with
 ///             {callback}
 ///             - once (boolean) optional: defaults to false. Run the autocommand
diff --git a/src/nvim/auevents.lua b/src/nvim/auevents.lua
index a75ee3bbd5..fb0062e524 100644
--- a/src/nvim/auevents.lua
+++ b/src/nvim/auevents.lua
@@ -110,6 +110,7 @@ return {
     'TextChangedP',           -- text was modified in Insert mode(popup)
     'TextChangedT',           -- text was modified in Terminal mode
     'TextYankPost',           -- after a yank or delete was done (y, d, c)
+    'TextPutPost',            -- after a put was done (p, P)
     'UIEnter',                -- after UI attaches
     'UILeave',                -- after UI detaches
     'User',                   -- user defined autocommand
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 5c1e3af015..28c3374c0c 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -1410,6 +1410,7 @@ struct window_S {
   int w_prev_fraction_row;
 
   linenr_T w_nrwidth_line_count;        // line count when ml_nrwidth_width was computed.
+  linenr_T w_statuscol_line_count;      // line count when 'statuscolumn' width was computed.
   int w_nrwidth_width;                  // nr of chars to print line count.
 
   qf_info_T *w_llist;                 // Location list for this window
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
index be815151ef..5e4b49db24 100644
--- a/src/nvim/cmdexpand.c
+++ b/src/nvim/cmdexpand.c
@@ -109,6 +109,7 @@ static bool cmdline_fuzzy_completion_supported(const expand_T *const xp)
          && xp->xp_context != EXPAND_OLD_SETTING
          && xp->xp_context != EXPAND_OWNSYNTAX
          && xp->xp_context != EXPAND_PACKADD
+         && xp->xp_context != EXPAND_RUNTIME
          && xp->xp_context != EXPAND_SHELLCMD
          && xp->xp_context != EXPAND_TAGS
          && xp->xp_context != EXPAND_TAGS_LISTFILES
@@ -1215,6 +1216,7 @@ char *addstar(char *fname, size_t len, int context)
         || context == EXPAND_OWNSYNTAX
         || context == EXPAND_FILETYPE
         || context == EXPAND_PACKADD
+        || context == EXPAND_RUNTIME
         || ((context == EXPAND_TAGS_LISTFILES || context == EXPAND_TAGS)
             && fname[0] == '/')) {
       retval = xstrnsave(fname, len);
@@ -2092,6 +2094,10 @@ static const char *set_context_by_cmdname(const char *cmd, cmdidx_T cmdidx, expa
     xp->xp_pattern = (char *)arg;
     break;
 
+  case CMD_runtime:
+    set_context_in_runtime_cmd(xp, arg);
+    break;
+
 #ifdef HAVE_WORKING_LIBINTL
   case CMD_language:
     return set_context_in_lang_cmd(xp, arg);
@@ -2733,6 +2739,9 @@ static int ExpandFromContext(expand_T *xp, char *pat, char ***matches, int *numM
   if (xp->xp_context == EXPAND_PACKADD) {
     return ExpandPackAddDir(pat, numMatches, matches);
   }
+  if (xp->xp_context == EXPAND_RUNTIME) {
+    return expand_runtime_cmd(pat, numMatches, matches);
+  }
 
   // When expanding a function name starting with s:, match the <SNR>nr_
   // prefix.
@@ -3201,11 +3210,12 @@ static int ExpandUserLua(expand_T *xp, int *num_file, char ***file)
 
 /// Expand `file` for all comma-separated directories in `path`.
 /// Adds matches to `ga`.
-void globpath(char *path, char *file, garray_T *ga, int expand_options)
+/// If "dirs" is true only expand directory names.
+void globpath(char *path, char *file, garray_T *ga, int expand_options, bool dirs)
 {
   expand_T xpc;
   ExpandInit(&xpc);
-  xpc.xp_context = EXPAND_FILES;
+  xpc.xp_context = dirs ? EXPAND_DIRECTORIES : EXPAND_FILES;
 
   char *buf = xmalloc(MAXPATHL);
 
@@ -3524,11 +3534,14 @@ void f_getcompletion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
     set_context_in_menu_cmd(&xpc, "menu", xpc.xp_pattern, false);
     xpc.xp_pattern_len = strlen(xpc.xp_pattern);
   }
-
   if (xpc.xp_context == EXPAND_SIGN) {
     set_context_in_sign_cmd(&xpc, xpc.xp_pattern);
     xpc.xp_pattern_len = strlen(xpc.xp_pattern);
   }
+  if (xpc.xp_context == EXPAND_RUNTIME) {
+    set_context_in_runtime_cmd(&xpc, xpc.xp_pattern);
+    xpc.xp_pattern_len = strlen(xpc.xp_pattern);
+  }
 
 theend:
   if (cmdline_fuzzy_completion_supported(&xpc)) {
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
index 031ad39f75..83aa68194c 100644
--- a/src/nvim/drawline.c
+++ b/src/nvim/drawline.c
@@ -412,7 +412,6 @@ static void get_statuscol_str(win_T *wp, linenr_T lnum, int row, int startrow, i
   bool use_cul = use_cursor_line_sign(wp, lnum);
   int virtnum = row - startrow - filler_lines;
 
-  set_vim_var_nr(VV_VIRTNUM, virtnum);
   // When called the first time for line "lnum" set num_attr
   if (stcp->num_attr == 0) {
     stcp->num_attr = sign_num_attr ? sign_num_attr
@@ -437,6 +436,18 @@ static void get_statuscol_str(win_T *wp, linenr_T lnum, int row, int startrow, i
   }
   stcp->sign_text[i] = NULL;
 
+  // When a buffer's line count has changed, make a best estimate for the full
+  // width of the status column by building with "w_nrwidth_line_count". Add
+  // potentially truncated width and rebuild before drawing anything.
+  if (wp->w_statuscol_line_count != wp->w_nrwidth_line_count) {
+    wp->w_statuscol_line_count = wp->w_nrwidth_line_count;
+    set_vim_var_nr(VV_VIRTNUM, 0);
+    build_statuscol_str(wp, wp->w_nrwidth_line_count, 0, stcp->width,
+                        ' ', stcp->text, &stcp->hlrec, stcp);
+    stcp->width += stcp->truncate;
+  }
+  set_vim_var_nr(VV_VIRTNUM, virtnum);
+
   int width = build_statuscol_str(wp, lnum, relnum, stcp->width,
                                   ' ', stcp->text, &stcp->hlrec, stcp);
   // Force a redraw in case of error or when truncated
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 095d73f53f..96df6a3044 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -1483,7 +1483,7 @@ static void init_prompt(int cmdchar_todo)
     }
     curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
     coladvance(MAXCOL);
-    changed_bytes(curbuf->b_ml.ml_line_count, 0);
+    inserted_bytes(curbuf->b_ml.ml_line_count, 0, 0, (colnr_T)strlen(prompt));
   }
 
   // Insert always starts after the prompt, allow editing text after it.
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index c17a44b990..9a5ab51c71 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -26,7 +26,7 @@ return {
     acos={args=1, base=1, float_func="acos"},  -- WJMc
     add={args=2, base=1},
     ['and']={args=2, base=1},
-    api_info={},
+    api_info={fast=true},
     append={args=2, base=2},
     appendbufline={args=3, base=3},
     argc={args={0, 1}},
@@ -64,14 +64,14 @@ return {
     bufwinid={args=1, base=1},
     bufwinnr={args=1, base=1},
     byte2line={args=1, base=1},
-    byteidx={args=2, base=1},
-    byteidxcomp={args=2, base=1},
+    byteidx={args=2, base=1, fast=true},
+    byteidxcomp={args=2, base=1, fast=true},
     call={args={2, 3}, base=1},
     ceil={args=1, base=1, float_func="ceil"},
     changenr={},
     chanclose={args={1, 2}},
     chansend={args=2},
-    char2nr={args={1, 2}, base=1},
+    char2nr={args={1, 2}, base=1, fast=true},
     charclass={args=1, base=1},
     charcol={args={1, 2}, base=1},
     charidx={args={2, 3}, base=1},
@@ -100,7 +100,7 @@ return {
     deletebufline={args={2,3}, base=1},
     dictwatcheradd={args=3},
     dictwatcherdel={args=3},
-    did_filetype={},
+    did_filetype={fast=true},
     diff_filler={args=1, base=1},
     diff_hlID={args=2, base=1},
     digraph_get={args=1, base=1},
@@ -108,11 +108,11 @@ return {
     digraph_set={args=2, base=1},
     digraph_setlist={args=1, base=1},
     empty={args=1, base=1},
-    environ={},
-    escape={args=2, base=1},
+    environ={fast=true},
+    escape={args=2, base=1, fast=true},
     eval={args=1, base=1},
     eventhandler={},
-    executable={args=1, base=1},
+    executable={args=1, base=1, fast=true},
     execute={args={1, 2}, base=1},
     exepath={args=1, base=1},
     exists={args=1, base=1},
@@ -122,8 +122,8 @@ return {
     extend={args={2, 3}, base=1},
     feedkeys={args={1, 2}, base=1},
     file_readable={args=1, base=1, func='f_filereadable'},  -- obsolete
-    filereadable={args=1, base=1},
-    filewritable={args=1, base=1},
+    filereadable={args=1, base=1, fast=true},
+    filewritable={args=1, base=1, fast=true},
     filter={args=2, base=1},
     finddir={args={1, 3}, base=1},
     findfile={args={1, 3}, base=1},
@@ -131,8 +131,8 @@ return {
     float2nr={args=1, base=1},
     floor={args=1, base=1, float_func="floor"},
     fmod={args=2, base=1},
-    fnameescape={args=1, base=1},
-    fnamemodify={args=2, base=1},
+    fnameescape={args=1, base=1, fast=true},
+    fnamemodify={args=2, base=1, fast=true},
     foldclosed={args=1, base=1},
     foldclosedend={args=1, base=1},
     foldlevel={args=1, base=1},
@@ -167,17 +167,17 @@ return {
     getcwd={args={0, 2}, base=1},
     getenv={args=1, base=1},
     getfontname={args={0, 1}},
-    getfperm={args=1, base=1},
-    getfsize={args=1, base=1},
-    getftime={args=1, base=1},
-    getftype={args=1, base=1},
+    getfperm={args=1, base=1, fast=true},
+    getfsize={args=1, base=1, fast=true},
+    getftime={args=1, base=1, fast=true},
+    getftype={args=1, base=1, fast=true},
     getjumplist={args={0, 2}, base=1},
     getline={args={1, 2}, base=1},
     getloclist={args={1, 2}},
     getmarklist={args={0, 1}, base=1},
     getmatches={args={0, 1}},
     getmousepos={},
-    getpid={},
+    getpid={fast=true},
     getpos={args=1, base=1},
     getqflist={args={0, 1}},
     getreg={args={0, 3}, base=1},
@@ -208,7 +208,7 @@ return {
     histnr={args=1, base=1},
     hlID={args=1, base=1},
     hlexists={args=1, base=1},
-    hostname={},
+    hostname={fast=true},
     iconv={args=3, base=1, fast=true},
     indent={args=1, base=1},
     index={args={2, 4}, base=1},
@@ -221,7 +221,7 @@ return {
     insert={args={2, 3}, base=1},
     interrupt={args=0},
     invert={args=1, base=1},
-    isdirectory={args=1, base=1},
+    isdirectory={args=1, base=1, fast=true},
     isinf={args=1, base=1},
     islocked={args=1, base=1},
     isnan={args=1, base=1},
@@ -300,13 +300,13 @@ return {
     reg_executing={},
     reg_recording={},
     reg_recorded={},
-    reltime={args={0, 2}, base=1},
-    reltimefloat={args=1, base=1},
-    reltimestr={args=1, base=1},
+    reltime={args={0, 2}, base=1, fast=true},
+    reltimefloat={args=1, base=1, fast=true},
+    reltimestr={args=1, base=1, fast=true},
     remove={args={2, 3}, base=1},
     rename={args=2, base=1},
-    ['repeat']={args=2, base=1},
-    resolve={args=1, base=1},
+    ['repeat']={args=2, base=1, fast=true},
+    resolve={args=1, base=1, fast=true},
     reverse={args=1, base=1},
     round={args=1, base=1, float_func="round"},
     rpcnotify={args=varargs(2)},
@@ -374,24 +374,24 @@ return {
     split={args={1, 3}, base=1},
     sqrt={args=1, base=1, float_func="sqrt"},
     srand={args={0, 1}, base=1},
-    stdpath={args=1},
+    stdpath={args=1, fast=true},
     str2float={args=1, base=1},
     str2list={args={1, 2}, base=1},
     str2nr={args={1, 3}, base=1},
     strcharlen={args=1, base=1},
-    strcharpart={args={2, 3}, base=1},
+    strcharpart={args={2, 3}, base=1, fast=true},
     strchars={args={1, 2}, base=1},
     strdisplaywidth={args={1, 2}, base=1},
     strftime={args={1, 2}, base=1},
     strgetchar={args=2, base=1},
-    stridx={args={2, 3}, base=1},
+    stridx={args={2, 3}, base=1, fast=true},
     string={args=1, base=1},
     strlen={args=1, base=1},
-    strpart={args={2, 4}, base=1},
+    strpart={args={2, 4}, base=1, fast=true},
     strptime={args=2, base=1},
     strridx={args={2, 3}, base=1},
-    strtrans={args=1, base=1},
-    strwidth={args=1, base=1},
+    strtrans={args=1, base=1, fast=true},
+    strwidth={args=1, base=1, fast=true},
     submatch={args={1, 2}, base=1},
     substitute={args=4, base=1},
     swapinfo={args=1, base=1},
@@ -419,12 +419,12 @@ return {
     timer_start={args={2, 3}, base=1},
     timer_stop={args=1, base=1},
     timer_stopall={args=0},
-    tolower={args=1, base=1},
-    toupper={args=1, base=1},
+    tolower={args=1, base=1, fast=true},
+    toupper={args=1, base=1, fast=true},
     tr={args=3, base=1},
     trim={args={1, 3}, base=1},
     trunc={args=1, base=1, float_func="trunc"},
-    type={args=1, base=1},
+    type={args=1, base=1, fast=true},
     undofile={args=1, base=1},
     undotree={},
     uniq={args={1, 3}, base=1},
@@ -447,7 +447,7 @@ return {
     win_splitmove={args={2, 3}, base=1},
     winbufnr={args=1, base=1},
     wincol={},
-    windowsversion={},
+    windowsversion={fast=true},
     winheight={args=1, base=1},
     winlayout={args={0, 1}, base=1},
     winline={},
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 33f8af451f..569c1462d1 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -2983,7 +2983,7 @@ static void f_globpath(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
   if (file != NULL && !error) {
     garray_T ga;
     ga_init(&ga, (int)sizeof(char *), 10);
-    globpath((char *)tv_get_string(&argvars[0]), (char *)file, &ga, flags);
+    globpath((char *)tv_get_string(&argvars[0]), (char *)file, &ga, flags, false);
 
     if (rettv->v_type == VAR_STRING) {
       rettv->vval.v_string = ga_concat_strings_sep(&ga, "\n");
@@ -3064,9 +3064,6 @@ static void f_has(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
     "conceal",
     "cursorbind",
     "cursorshape",
-#ifdef DEBUG
-    "debug",
-#endif
     "dialog_con",
     "diff",
     "digraphs",
@@ -7826,34 +7823,35 @@ static void f_strftime(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
   // MSVC returns NULL for an invalid value of seconds.
   if (curtime_ptr == NULL) {
     rettv->vval.v_string = xstrdup(_("(Invalid)"));
-  } else {
-    vimconv_T conv;
+    return;
+  }
 
-    conv.vc_type = CONV_NONE;
-    char *enc = enc_locale();
-    convert_setup(&conv, p_enc, enc);
-    if (conv.vc_type != CONV_NONE) {
-      p = string_convert(&conv, p, NULL);
-    }
-    char result_buf[256];
-    if (p == NULL || strftime(result_buf, sizeof(result_buf), p, curtime_ptr) == 0) {
-      result_buf[0] = NUL;
-    }
+  vimconv_T conv;
 
-    if (conv.vc_type != CONV_NONE) {
-      xfree(p);
-    }
-    convert_setup(&conv, enc, p_enc);
-    if (conv.vc_type != CONV_NONE) {
-      rettv->vval.v_string = string_convert(&conv, result_buf, NULL);
-    } else {
-      rettv->vval.v_string = xstrdup(result_buf);
-    }
+  conv.vc_type = CONV_NONE;
+  char *enc = enc_locale();
+  convert_setup(&conv, p_enc, enc);
+  if (conv.vc_type != CONV_NONE) {
+    p = string_convert(&conv, p, NULL);
+  }
+  char result_buf[256];
+  if (p == NULL || strftime(result_buf, sizeof(result_buf), p, curtime_ptr) == 0) {
+    result_buf[0] = NUL;
+  }
 
-    // Release conversion descriptors.
-    convert_setup(&conv, NULL, NULL);
-    xfree(enc);
+  if (conv.vc_type != CONV_NONE) {
+    xfree(p);
   }
+  convert_setup(&conv, enc, p_enc);
+  if (conv.vc_type != CONV_NONE) {
+    rettv->vval.v_string = string_convert(&conv, result_buf, NULL);
+  } else {
+    rettv->vval.v_string = xstrdup(result_buf);
+  }
+
+  // Release conversion descriptors.
+  convert_setup(&conv, NULL, NULL);
+  xfree(enc);
 }
 
 /// "strgetchar()" function
@@ -8657,6 +8655,7 @@ static void f_timer_pause(typval_T *argvars, typval_T *unused, EvalFuncData fptr
     emsg(_(e_number_exp));
     return;
   }
+
   int paused = (bool)tv_get_number(&argvars[1]);
   timer_T *timer = find_timer_by_nr(tv_get_number(&argvars[0]));
   if (timer != NULL) {
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 05b4737206..c298064d86 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c