diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-01-02 18:55:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-01-02 18:55:27 +0200 |
| commit | 443f1719947060d87b87ee09aba7af30e75206dc (patch) | |
| tree | 85bad16863146de0434a45909c78176d38243a1e /src/composite.c | |
| parent | 1e8bb313eaa98928dc258f4b903bb10c33c21642 (diff) | |
| download | emacs-443f1719947060d87b87ee09aba7af30e75206dc.tar.gz | |
Fix compilation --without-x
* src/composite.c (autocmp_chars) [HAVE_WINDOW_SYSTEM]: Call
font_range only if it is compiled in. (Bug#25334)
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/composite.c b/src/composite.c index 5e6d628bbf1..f23bb17c57a 100644 --- a/src/composite.c +++ b/src/composite.c @@ -891,6 +891,8 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, if (len <= 0) return unbind_to (count, Qnil); to = limit = charpos + len; + font_object = win->frame; +#ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) { font_object = font_range (charpos, bytepos, &to, win, face, string); @@ -900,8 +902,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, && (fast_looking_at (re, charpos, bytepos, to, -1, string) <= 0))) return unbind_to (count, Qnil); } - else - font_object = win->frame; +#endif lgstring = Fcomposition_get_gstring (pos, make_number (to), font_object, string); if (NILP (LGSTRING_ID (lgstring))) |