From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 6 Apr 2011 04:34:35 +0000 (-0700)
Subject: Undo Fstring_to_unibyte change.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06c550d2b8e71409c0bbff25f228206242d0f1b8;p=emacs.git

Undo Fstring_to_unibyte change.
---

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);
     }