diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/character.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
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 | ||