diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-20 21:33:23 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-20 21:33:23 -0700 |
| commit | de883a701d8f0db9595c6c459fdff9e3bb20bc83 (patch) | |
| tree | aba160bb28d92c3fbec56549e211bd1f705b273e /src/character.h | |
| parent | 1dcf791fefa6533a06f58a5d2d074f59f06ee9ae (diff) | |
| download | emacs-de883a701d8f0db9595c6c459fdff9e3bb20bc83.tar.gz emacs-de883a701d8f0db9595c6c459fdff9e3bb20bc83.tar.bz2 emacs-de883a701d8f0db9595c6c459fdff9e3bb20bc83.zip | |
merge count_size_as_multibyte, parse_str_to_multibyte
* character.c, character.h (count_size_as_multibyte):
Renamed from parse_str_to_multibyte; all uses changed.
Check for integer overflow.
* insdel.c, lisp.h (count_size_as_multibyte): Remove,
since it's now a duplicate of the other. This is more of
a character than a buffer op, so better that it's in character.c.
* fns.c, print.c: Adjust to above changes.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/character.h b/src/character.h index 5877d145d9e..31e3b0a9416 100644 --- a/src/character.h +++ b/src/character.h @@ -602,7 +602,7 @@ extern int translate_char (Lisp_Object, int c); extern int char_printable_p (int c); extern void parse_str_as_multibyte (const unsigned char *, EMACS_INT, EMACS_INT *, EMACS_INT *); -extern EMACS_INT parse_str_to_multibyte (const unsigned char *, EMACS_INT); +extern EMACS_INT count_size_as_multibyte (const unsigned char *, EMACS_INT); extern EMACS_INT str_as_multibyte (unsigned char *, EMACS_INT, EMACS_INT, EMACS_INT *); extern EMACS_INT str_to_multibyte (unsigned char *, EMACS_INT, EMACS_INT); |