diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-02-13 11:14:38 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-02-13 11:14:38 +0400 |
| commit | 5a655b9f0d19703aad9331378c02e9c782412386 (patch) | |
| tree | a6ce6b855a4014cdedc903ee8c69d0b415fd9d3c /src/composite.c | |
| parent | eeb468daa1a5c8b64b939c1b3c4144c21a38f281 (diff) | |
| download | emacs-5a655b9f0d19703aad9331378c02e9c782412386.tar.gz | |
* font.c (font_range): Add pos_byte argument. Adjust comment
and break long line.
* font.h (font_range): Adjust prototype.
* composite.c (autocmp_chars): Pass byte position to font_range.
Break long line. Remove useless prototype and format comment.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/composite.c b/src/composite.c index 54cebc00eb7..9bbd4550c7b 100644 --- a/src/composite.c +++ b/src/composite.c @@ -642,13 +642,7 @@ compose_text (ptrdiff_t start, ptrdiff_t end, Lisp_Object components, Qcomposition, prop, string); } - -static Lisp_Object autocmp_chars (Lisp_Object, ptrdiff_t, ptrdiff_t, - ptrdiff_t, struct window *, - struct face *, Lisp_Object); - - -/* Lisp glyph-string handlers */ +/* Lisp glyph-string handlers. */ /* Hash table for automatic composition. The key is a header of a lgstring (Lispy glyph-string), and the value is a body of a @@ -905,7 +899,9 @@ fill_gstring_body (Lisp_Object gstring) object. Otherwise return nil. */ static Lisp_Object -autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t limit, struct window *win, struct face *face, Lisp_Object string) +autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, + ptrdiff_t limit, struct window *win, struct face *face, + Lisp_Object string) { ptrdiff_t count = SPECPDL_INDEX (); FRAME_PTR f = XFRAME (win->frame); @@ -935,7 +931,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) { - font_object = font_range (charpos, &to, win, face, string); + font_object = font_range (charpos, bytepos, &to, win, face, string); if (! FONT_OBJECT_P (font_object) || (! NILP (re) && to < limit |