Mercurial > emacs

changeset 21029:3f47b0364c2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is moved to charset.h. (concat): Use unibyte_char_to_multibyte.
author Kenichi Handa <handa@m17n.org>
date Tue, 03 Mar 1998 01:29:16 +0000
parents 0e9e9906db7b
children 293eb7d1a966
files src/fns.c
diffstat 1 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/fns.c	Tue Mar 03 01:29:16 1998 +0000
+++ b/src/fns.c	Tue Mar 03 01:29:16 1998 +0000
@@ -40,8 +40,6 @@
 #define NULL (void *)0
 #endif
 
-#define DEFAULT_NONASCII_INSERT_OFFSET 0x800
-
 /* Nonzero enables use of dialog boxes for questions
    asked by mouse commands.  */
 int use_dialog_box;
@@ -573,9 +571,9 @@
 	      break;
 	    else if (STRINGP (this))
 	      {
+		int c;
 		if (STRING_MULTIBYTE (this))
 		  {
-		    int c;
 		    FETCH_STRING_CHAR_ADVANCE (c, this,
 					       thisindex,
 					       thisindex_byte);
@@ -583,21 +581,11 @@
 		  }
 		else
 		  {
-		    unsigned char c;
 		    XSETFASTINT (elt, XSTRING (this)->data[thisindex++]);
 		    if (some_multibyte && XINT (elt) >= 0200
 			&& XINT (elt) < 0400)
 		      {
-			c = XINT (elt);
-
-			if (! NILP (Vnonascii_translate_table))
-			  c = XINT (Faref (Vnonascii_translate_table,
-					   make_number (c)));
-			else if (nonascii_insert_offset > 0)
-			  c += nonascii_insert_offset;
-			else
-			  c += DEFAULT_NONASCII_INSERT_OFFSET;
-
+			c = unibyte_char_to_multibyte (XINT (elt));
 			XSETINT (elt, c);
 		      }
 		  }
@@ -793,7 +781,7 @@
 }
 
 /* Convert STRING to a multibyte string.
-   Single-byte characters 0200 through 0377 are converted
+   Single-byte characters 0240 through 0377 are converted
    by adding nonascii_insert_offset to each.  */
 
 Lisp_Object