Commit c2cd8e62 authored by Paul Eggert's avatar Paul Eggert

Fix byte-counting error in ‘format’

Problem reported by Paul Pogonyshev (Bug#38191).
* src/editfns.c (styled_format): When checking for adjacent
%-sequences, use byte position rather than character position.
* test/src/editfns-tests.el (format-properties): Test for fix.
parent 2241f7ca
Pipeline #4045 failed with stage
in 61 minutes and 30 seconds
......@@ -3143,7 +3143,7 @@ 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. */
/* The start bytepos of the spec in the format string. */
ptrdiff_t fbeg;
/* Whether the argument is a string with intervals. */
......@@ -3954,7 +3954,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
{
position++;
if (fieldn < nspec
&& position > info[fieldn].fbeg
&& bytepos >= info[fieldn].fbeg
&& translated == info[fieldn].start)
{
translated += info[fieldn].end - info[fieldn].start;
......@@ -3976,7 +3976,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
{
position++;
if (fieldn < nspec
&& position > info[fieldn].fbeg
&& bytepos >= info[fieldn].fbeg
&& translated == info[fieldn].start)
{
translated += info[fieldn].end - info[fieldn].start;
......
......@@ -90,6 +90,10 @@
(propertize "45" 'face 'italic)))
#("012345 "
0 2 (face bold) 2 4 (face underline) 4 10 (face italic))))
;; Bug #38191
(should (ert-equal-including-properties
(format (propertize "‘foo’ %s bar" 'face 'bold) "xxx")
#("‘foo’ xxx bar" 0 13 (face bold))))
;; Bug #32404
(should (ert-equal-including-properties
(format (concat (propertize "%s" 'face 'bold)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment