[Emacs-diffs] Changes to emacs/src/fns.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/07/04 02:22:43

Index: fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fns.c,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -b -r1.447 -r1.448
--- fns.c       25 Jun 2008 12:02:48 -0000      1.447
+++ fns.c       4 Jul 2008 02:22:42 -0000       1.448
@@ -1132,17 +1132,15 @@
 }
 
 DEFUN ("string-to-unibyte", Fstring_to_unibyte, Sstring_to_unibyte,
-       1, 2, 0,
+       1, 1, 0,
        doc: /* Return a unibyte string with the same individual chars as 
STRING.
 If STRING is unibyte, the result is STRING itself.
 Otherwise it is a newly created string, with no text properties,
 where each `eight-bit' character is converted to the corresponding byte.
 If STRING contains a non-ASCII, non-`eight-bit' character,
-an error is signaled.
-If the optional 2nd arg ACCEPT-LATIN-1 is non-nil, a Latin-1 character
-doesn't cause an error, but is converted to a byte of same code.  */)
-     (string, accept_latin_1)
-     Lisp_Object string, accept_latin_1;
+an error is signaled.  */)
+     (string)
+     Lisp_Object string;
 {
   CHECK_STRING (string);
 
@@ -1150,8 +1148,8 @@
     {
       EMACS_INT chars = SCHARS (string);
       unsigned char *str = (unsigned char *) xmalloc (chars);
-      EMACS_INT converted = str_to_unibyte (SDATA (string), str, chars,
-                                           ! NILP (accept_latin_1));
+      EMACS_INT converted = str_to_unibyte (SDATA (string), str, chars, 0);
+
       if (converted < chars)
        error ("Can't convert the %dth character to unibyte", converted);
       string = make_unibyte_string (str, chars);