diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/character.h | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/character.h b/src/character.h index 624f4fff3f0..5043880cb42 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -657,7 +657,6 @@ extern ptrdiff_t c_string_width (const unsigned char *, ptrdiff_t, int, | |||
| 657 | extern ptrdiff_t lisp_string_width (Lisp_Object, ptrdiff_t, | 657 | extern ptrdiff_t lisp_string_width (Lisp_Object, ptrdiff_t, |
| 658 | ptrdiff_t *, ptrdiff_t *); | 658 | ptrdiff_t *, ptrdiff_t *); |
| 659 | 659 | ||
| 660 | extern Lisp_Object Qcharacterp; | ||
| 661 | extern Lisp_Object Vchar_unify_table; | 660 | extern Lisp_Object Vchar_unify_table; |
| 662 | extern Lisp_Object string_escape_byte8 (Lisp_Object); | 661 | extern Lisp_Object string_escape_byte8 (Lisp_Object); |
| 663 | 662 | ||