diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fns.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 282b41afd3c..788defbbf60 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,10 +6,7 @@ * menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats. - * fns.c (Fstring_to_unibyte): Don't rely on undefined behavior - by passing a long int to a printf format expecting an int. - - * lisp.h (message, message_nolog, doprint, error, verror, fatal): + * lisp.h (message, message_nolog, doprnt, error, verror, fatal): Mark as printf-like functions. * xdisp.c (vmessage): Mark as a printf-like function. diff --git a/src/fns.c b/src/fns.c index ca18dbfc100..c45d9e31ef2 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1076,10 +1076,7 @@ an error is signaled. */) EMACS_INT converted = str_to_unibyte (SDATA (string), str, chars, 0); if (converted < chars) - { - long lconverted = converted; - error ("Can't convert the %ldth character to unibyte", lconverted); - } + error ("Can't convert the %dth character to unibyte", converted); string = make_unibyte_string ((char *) str, chars); xfree (str); } |