Commit 06c550d2 authored by Paul Eggert's avatar Paul Eggert
Browse files

Undo Fstring_to_unibyte change.

parent f390e2d5
......@@ -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.
......@@ -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);
}
......
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