Undo Fstring_to_unibyte change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 282b41afd3ca7587fa67741bdb6c1a26778e3ac8..788defbbf60c17e9e8e30364e8e44667b99b21c2 100644 (file)
--- 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 ca18dbfc100fa4c6fc9307332bdb71cb2ae4b5a9..c45d9e31ef27ecd45df81c50396e2e70754003df 100644 (file)
--- 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);
     }