Mercurial > emacs
changeset 107504:3c55036637ec
Fix bug in `format' (Bug#5710).
* editfns.c (Fformat): Account for string precision when computing
field width (Bug#5710).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 15 Mar 2010 11:51:48 -0400 |
| parents | 82e44180c8a6 |
| children | cea18e9685bf b81c0cdaa4b7 |
| files | src/ChangeLog src/editfns.c |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Mar 15 11:45:03 2010 +0100 +++ b/src/ChangeLog Mon Mar 15 11:51:48 2010 -0400 @@ -1,3 +1,8 @@ +2010-03-15 Andreas Politz <politza@fh-trier.de> (tiny change) + + * editfns.c (Fformat): Account for string precision when computing + field width (Bug#5710). + 2010-03-05 Stefan Monnier <monnier@iro.umontreal.ca> Make it possible to C-g in a tight bytecode loop again (bug#5680).
--- a/src/editfns.c Mon Mar 15 11:45:03 2010 +0100 +++ b/src/editfns.c Mon Mar 15 11:51:48 2010 -0400 @@ -3782,7 +3782,11 @@ to be as large as is calculated here. Easy check for the case PRECISION = 0. */ thissize = precision[n] ? CONVERTED_BYTE_SIZE (multibyte, args[n]) : 0; + /* The precision also constrains how much of the argument + string will finally appear (Bug#5710). */ actual_width = lisp_string_width (args[n], -1, NULL, NULL); + if (precision[n] != -1) + actual_width = min(actual_width,precision[n]); } /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */ else if (INTEGERP (args[n]) && *format != 's')