1 files changed, 25 insertions, 14 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7db9386937..fd37e1001a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -21297,8 +21297,6 @@ void ex_function(exarg_T *eap)
   bool overwrite = false;
   int indent;
   int nesting;
-  char_u      *skip_until = NULL;
-  char_u *trimmed = NULL;
   dictitem_T  *v;
   funcdict_T fudi;
   static int func_nr = 0;           /* number for nameless function */
@@ -21308,6 +21306,9 @@ void ex_function(exarg_T *eap)
   hashitem_T  *hi;
   linenr_T sourcing_lnum_off;
   linenr_T sourcing_lnum_top;
+  bool is_heredoc = false;
+  char_u *skip_until = NULL;
+  char_u *heredoc_trimmed = NULL;
   bool show_block = false;
   bool do_concat = true;
 
@@ -21608,14 +21609,27 @@ void ex_function(exarg_T *eap)
     }
 
     if (skip_until != NULL) {
-      // Between ":append" and "." and between ":python <<EOF" and "EOF"
-      // don't check for ":endfunc".
-      if (trimmed == NULL || STRNCMP(theline, trimmed, STRLEN(trimmed)) == 0) {
-        p = trimmed == NULL ? theline : theline + STRLEN(trimmed);
+      // Don't check for ":endfunc" between
+      // * ":append" and "."
+      // * ":python <<EOF" and "EOF"
+      // * ":let {var-name} =<< [trim] {marker}" and "{marker}"
+      if (heredoc_trimmed == NULL
+          || (is_heredoc && skipwhite(theline) == theline)
+          || STRNCMP(theline, heredoc_trimmed,
+                     STRLEN(heredoc_trimmed)) == 0) {
+        if (heredoc_trimmed == NULL) {
+          p = theline;
+        } else if (is_heredoc) {
+          p = skipwhite(theline) == theline
+            ? theline : theline + STRLEN(heredoc_trimmed);
+        } else {
+          p = theline + STRLEN(heredoc_trimmed);
+        }
         if (STRCMP(p, skip_until) == 0) {
           XFREE_CLEAR(skip_until);
-          XFREE_CLEAR(trimmed);
+          XFREE_CLEAR(heredoc_trimmed);
           do_concat = true;
+          is_heredoc = false;
         }
       }
     } else {
@@ -21723,19 +21737,16 @@ void ex_function(exarg_T *eap)
           && ((p[0] == 'l' && p[1] == 'e'
                && (!ASCII_ISALNUM(p[2])
                    || (p[2] == 't' && !ASCII_ISALNUM(p[3])))))) {
-        // ":let v =<<" continues until a dot
         p = skipwhite(arg + 3);
         if (STRNCMP(p, "trim", 4) == 0) {
           // Ignore leading white space.
           p = skipwhite(p + 4);
-          trimmed = vim_strnsave(theline, (int)(skipwhite(theline) - theline));
-        }
-        if (*p == NUL) {
-          skip_until = vim_strsave((char_u *)".");
-        } else {
-          skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
+          heredoc_trimmed = vim_strnsave(theline,
+                                         (int)(skipwhite(theline) - theline));
         }
+        skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
         do_concat = false;
+        is_heredoc = true;
       }
     }