aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-06-19 01:54:37 +0000
committerKenichi Handa2006-06-19 01:54:37 +0000
commit7ea7f6369b843ea3f39bf0baef07760cac11b492 (patch)
tree1336622d8768043459306e1b48315778ceafb0eb /src
parent9ca37324496bb8c50562dca18852dcd12d3c12dc (diff)
downloademacs-7ea7f6369b843ea3f39bf0baef07760cac11b492.tar.gz
emacs-7ea7f6369b843ea3f39bf0baef07760cac11b492.zip
(read_escape): Fix the code synched with HEAD.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/lread.c b/src/lread.c
index 6ea92d1aebf..824bc5f7502 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2103,8 +2103,6 @@ read_escape (readcharfun, stringp)
2103 { 2103 {
2104 int i = 0; 2104 int i = 0;
2105 int count = 0; 2105 int count = 0;
2106 Lisp_Object lisp_char;
2107 struct gcpro gcpro1;
2108 2106
2109 while (++count <= unicode_hex_count) 2107 while (++count <= unicode_hex_count)
2110 { 2108 {
@@ -2121,22 +2119,7 @@ read_escape (readcharfun, stringp)
2121 } 2119 }
2122 } 2120 }
2123 2121
2124 GCPRO1 (readcharfun); 2122 return i;
2125 lisp_char = call2(intern("decode-char"), intern("ucs"),
2126 make_number(i));
2127 UNGCPRO;
2128
2129 if (EQ(Qnil, lisp_char))
2130 {
2131 /* This is ugly and horrible and trashes the user's data. */
2132 XSETFASTINT (i, MAKE_CHAR (charset_katakana_jisx0201,
2133 34 + 128, 46 + 128));
2134 return i;
2135 }
2136 else
2137 {
2138 return XFASTINT (lisp_char);
2139 }
2140 } 2123 }
2141 2124
2142 default: 2125 default: