Merge from origin/emacs-26

71c92d8 Fix copying text properties by 'format'
96be6b6 Improve error messages regarding initial-buffer-choice (Bug#2...
00fb127 * test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01):...

Conflicts:
	lisp/startup.el

1 files changed, 10 insertions, 2 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 0fbc5aad8c3..a4cff595bd0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4268,6 +4268,9 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
     /* The start and end bytepos in the output string.  */
     ptrdiff_t start, end;
 
+    /* The start of the spec in the format string.  */
+    ptrdiff_t fbeg;
+
     /* Whether the argument is a string with intervals.  */
     bool_bf intervals : 1;
   } *info;
@@ -4421,6 +4424,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
           char conversion = *format++;
           memset (&discarded[format0 - format_start], 1,
                   format - format0 - (conversion == '%'));
+          info[ispec].fbeg = format0 - format_start;
           if (conversion == '%')
             {
               new_result = true;
@@ -5011,7 +5015,9 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
                   else if (discarded[bytepos] == 1)
                     {
                       position++;
-                      if (fieldn < nspec && translated == info[fieldn].start)
+                      if (fieldn < nspec
+                          && position > info[fieldn].fbeg
+                          && translated == info[fieldn].start)
                         {
                           translated += info[fieldn].end - info[fieldn].start;
                           fieldn++;
@@ -5031,7 +5037,9 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
                   else if (discarded[bytepos] == 1)
                     {
                       position++;
-                      if (fieldn < nspec && translated == info[fieldn].start)
+                      if (fieldn < nspec
+                          && position > info[fieldn].fbeg
+                          && translated == info[fieldn].start)
                         {
                           translated += info[fieldn].end - info[fieldn].start;
                           fieldn++;