aboutsummaryrefslogtreecommitdiffstats
path: root/src/lread.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-06-23 08:11:29 +0400
committerDmitry Antipov2014-06-23 08:11:29 +0400
commit200fc9496f7e2d53610e31634fdcd750d1870279 (patch)
tree50114538abd0729d13d05e95a3f48dbb742f5528 /src/lread.c
parent33848c48a5e8823f44994624443fabdf615292dc (diff)
downloademacs-200fc9496f7e2d53610e31634fdcd750d1870279.tar.gz
emacs-200fc9496f7e2d53610e31634fdcd750d1870279.zip
Simplify and cleanup character conversion stuff.
* lisp.h (multibyte_char_to_unibyte, multibyte_char_to_unibyte_safe): Remove prototypes. * character.c (multibyte_char_to_unibyte) (multibyte_char_to_unibyte_safe): Remove; no longer used. * character.h (make_char): Remove; unused. (CHAR_TO_BYTE8, CHAR_TO_BYTE_SAFE): Simplify. (ASCII_BYTE_P): Remove; ASCII_CHAR_P does the same thing. * buffer.c, charset.c, charset.h, cmds.c, coding.c, editfns.c: * fileio.c, indent.c, insdel.c, keyboard.c, lread.c, print.c: * search.c, term.c, xdisp.c, xterm.c: Related users changed.
Diffstat (limited to 'src/lread.c')
-rw-r--r--src/lread.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c
index 41ea1f19227..f252993207d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -213,7 +213,7 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
213 else 213 else
214 { 214 {
215 c = BUF_FETCH_BYTE (inbuffer, pt_byte); 215 c = BUF_FETCH_BYTE (inbuffer, pt_byte);
216 if (! ASCII_BYTE_P (c)) 216 if (! ASCII_CHAR_P (c))
217 c = BYTE8_TO_CHAR (c); 217 c = BYTE8_TO_CHAR (c);
218 pt_byte++; 218 pt_byte++;
219 } 219 }
@@ -242,7 +242,7 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
242 else 242 else
243 { 243 {
244 c = BUF_FETCH_BYTE (inbuffer, bytepos); 244 c = BUF_FETCH_BYTE (inbuffer, bytepos);
245 if (! ASCII_BYTE_P (c)) 245 if (! ASCII_CHAR_P (c))
246 c = BYTE8_TO_CHAR (c); 246 c = BYTE8_TO_CHAR (c);
247 bytepos++; 247 bytepos++;
248 } 248 }
@@ -324,7 +324,7 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
324 return c; 324 return c;
325 if (multibyte) 325 if (multibyte)
326 *multibyte = 1; 326 *multibyte = 1;
327 if (ASCII_BYTE_P (c)) 327 if (ASCII_CHAR_P (c))
328 return c; 328 return c;
329 if (emacs_mule_encoding) 329 if (emacs_mule_encoding)
330 return read_emacs_mule_char (c, readbyte, readcharfun); 330 return read_emacs_mule_char (c, readbyte, readcharfun);