Commit 50606b4c authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(Fformat): Don't extend text properties from arguments

to padding chars in the result.
parent 21c2bbe0
2001-01-22 Gerd Moellmann <gerd@gnu.org>
* editfns.c (Fformat): Don't extend text properties from arguments
to padding chars in the result.
2001-01-20 Eli Zaretskii <eliz@is.elta.co.il>
* s/msdos.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.
......
......@@ -3310,9 +3310,8 @@ Use %% to put a single % into the output.")
if (STRINGP (args[n]))
{
int padding, nbytes;
int padding, nbytes, start, end;
int width = lisp_string_width (args[n], -1, NULL, NULL);
int start = nchars;
/* If spec requires it, pad on right with spaces. */
padding = minlen - width;
......@@ -3320,9 +3319,11 @@ Use %% to put a single % into the output.")
while (padding-- > 0)
{
*p++ = ' ';
nchars++;
++nchars;
}
start = nchars;
if (p > buf
&& multibyte
&& !ASCII_BYTE_P (*((unsigned char *) p - 1))
......@@ -3334,6 +3335,7 @@ Use %% to put a single % into the output.")
STRING_MULTIBYTE (args[n]), multibyte);
p += nbytes;
nchars += XSTRING (args[n])->size;
end = nchars;
if (negative)
while (padding-- > 0)
......@@ -3354,7 +3356,7 @@ Use %% to put a single % into the output.")
}
info[n].start = start;
info[n].end = nchars;
info[n].end = end;
}
}
else if (INTEGERP (args[n]) || FLOATP (args[n]))
......
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