diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/character.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
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 7a75ac186fa..864882db7f6 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -615,7 +615,7 @@ extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int, | |||
| 615 | extern EMACS_INT lisp_string_width (Lisp_Object, int, | 615 | extern EMACS_INT lisp_string_width (Lisp_Object, int, |
| 616 | EMACS_INT *, EMACS_INT *); | 616 | EMACS_INT *, EMACS_INT *); |
| 617 | 617 | ||
| 618 | extern Lisp_Object Qcharacterp, Qauto_fill_chars; | 618 | extern Lisp_Object Qcharacterp; |
| 619 | extern Lisp_Object Vchar_unify_table; | 619 | extern Lisp_Object Vchar_unify_table; |
| 620 | extern Lisp_Object string_escape_byte8 (Lisp_Object); | 620 | extern Lisp_Object string_escape_byte8 (Lisp_Object); |
| 621 | 621 | ||