mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-03 08:30:09 +00:00
Undo Fstring_to_unibyte change.
This commit is contained in:
parent
f390e2d53a
commit
06c550d2b8
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user