From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 17 May 2017 17:25:21 +0000 (-0700)
Subject: Pacify --enable-gcc-warnings --with-x-toolkit=no
X-Git-Tag: emacs-26.0.90~521^2~381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b93b754c108f620428eaf9b193eeb321f3010db;p=emacs.git

Pacify --enable-gcc-warnings --with-x-toolkit=no

* src/composite.c (autocmp_chars) [!HAVE_WINDOW_SYSTEM]:
Avoid unused local.
---

diff --git a/src/composite.c b/src/composite.c
index b673c53ac83..05a296329a6 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -867,7 +867,6 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos,
 	       Lisp_Object string)
 {
   ptrdiff_t count = SPECPDL_INDEX ();
-  struct frame *f = XFRAME (win->frame);
   Lisp_Object pos = make_number (charpos);
   ptrdiff_t to;
   ptrdiff_t pt = PT, pt_byte = PT_BYTE;
@@ -893,6 +892,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos,
   to = limit = charpos + len;
   font_object = win->frame;
 #ifdef HAVE_WINDOW_SYSTEM
+  struct frame *f = XFRAME (font_object);
   if (FRAME_WINDOW_P (f))
     {
       font_object = font_range (charpos, bytepos, &to, win, face, string);