Mercurial > emacs

changeset 20699:907d8633c8cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(concat): Use unibyte_char_to_multibyte. Fix lossage in installing previous patch.
author Richard M. Stallman <rms@gnu.org>
date Wed, 21 Jan 1998 21:43:30 +0000
parents ec08780e4c42
children 524d1cfb6913
files src/fns.c
diffstat 1 files changed, 4 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/fns.c	Wed Jan 21 21:42:19 1998 +0000
+++ b/src/fns.c	Wed Jan 21 21:43:30 1998 +0000
@@ -473,7 +473,7 @@
 	      }
 	  else if (STRINGP (this))
 	    {
-	      result_len_byte += XSTRING (this)->size_byte;
+	      if (STRING_MULTIBYTE (this))
 		{
 		  some_multibyte = 1;
 		  result_len_byte += XSTRING (this)->size_byte;
@@ -572,17 +572,9 @@
 		      {
 			unsigned char c;
 			XSETFASTINT (elt, XSTRING (this)->data[thisindex++]);
-			if (some_multibyte && XINT (elt) >= 0200
-			    && XINT (elt) < 0400)
-			  {
-			    c = XINT (elt);
-			    if (nonascii_insert_offset > 0)
-			      c += nonascii_insert_offset;
-			    else
-			      c += DEFAULT_NONASCII_INSERT_OFFSET;
-
-			    XSETINT (elt, c);
-			  }
+			if (some_multibyte)
+			  XSETINT (elt,
+				   unibyte_char_to_multibyte (XINT (elt)));
 		      }
 		  }
 		else if (BOOL_VECTOR_P (this))