diff options
| author | Dmitry Antipov | 2014-06-23 08:11:29 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-06-23 08:11:29 +0400 |
| commit | 200fc9496f7e2d53610e31634fdcd750d1870279 (patch) | |
| tree | 50114538abd0729d13d05e95a3f48dbb742f5528 /src/buffer.c | |
| parent | 33848c48a5e8823f44994624443fabdf615292dc (diff) | |
| download | emacs-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/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index 909b3779b06..d6f6b2c7703 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2530,7 +2530,7 @@ current buffer is cleared. */) | |||
| 2530 | p = GAP_END_ADDR; | 2530 | p = GAP_END_ADDR; |
| 2531 | stop = Z; | 2531 | stop = Z; |
| 2532 | } | 2532 | } |
| 2533 | if (ASCII_BYTE_P (*p)) | 2533 | if (ASCII_CHAR_P (*p)) |
| 2534 | p++, pos++; | 2534 | p++, pos++; |
| 2535 | else if (CHAR_BYTE8_HEAD_P (*p)) | 2535 | else if (CHAR_BYTE8_HEAD_P (*p)) |
| 2536 | { | 2536 | { |
| @@ -2602,7 +2602,7 @@ current buffer is cleared. */) | |||
| 2602 | stop = Z; | 2602 | stop = Z; |
| 2603 | } | 2603 | } |
| 2604 | 2604 | ||
| 2605 | if (ASCII_BYTE_P (*p)) | 2605 | if (ASCII_CHAR_P (*p)) |
| 2606 | p++, pos++; | 2606 | p++, pos++; |
| 2607 | else if (EQ (flag, Qt) | 2607 | else if (EQ (flag, Qt) |
| 2608 | && ! CHAR_BYTE8_HEAD_P (*p) | 2608 | && ! CHAR_BYTE8_HEAD_P (*p) |