diff options
| author | Paul Eggert | 2017-05-17 10:25:21 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-05-17 10:59:02 -0700 |
| commit | 2b93b754c108f620428eaf9b193eeb321f3010db (patch) | |
| tree | 2dba4d5dbc522a7040987293f8b3bf4532b281a7 | |
| parent | 1b598d32aa06128fb5d9faa634118360e68a73c7 (diff) | |
| download | emacs-2b93b754c108f620428eaf9b193eeb321f3010db.tar.gz emacs-2b93b754c108f620428eaf9b193eeb321f3010db.zip | |
Pacify --enable-gcc-warnings --with-x-toolkit=no
* src/composite.c (autocmp_chars) [!HAVE_WINDOW_SYSTEM]:
Avoid unused local.
| -rw-r--r-- | src/composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 867 | Lisp_Object string) | 867 | Lisp_Object string) |
| 868 | { | 868 | { |
| 869 | ptrdiff_t count = SPECPDL_INDEX (); | 869 | ptrdiff_t count = SPECPDL_INDEX (); |
| 870 | struct frame *f = XFRAME (win->frame); | ||
| 871 | Lisp_Object pos = make_number (charpos); | 870 | Lisp_Object pos = make_number (charpos); |
| 872 | ptrdiff_t to; | 871 | ptrdiff_t to; |
| 873 | ptrdiff_t pt = PT, pt_byte = PT_BYTE; | 872 | ptrdiff_t pt = PT, pt_byte = PT_BYTE; |
| @@ -893,6 +892,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, | |||
| 893 | to = limit = charpos + len; | 892 | to = limit = charpos + len; |
| 894 | font_object = win->frame; | 893 | font_object = win->frame; |
| 895 | #ifdef HAVE_WINDOW_SYSTEM | 894 | #ifdef HAVE_WINDOW_SYSTEM |
| 895 | struct frame *f = XFRAME (font_object); | ||
| 896 | if (FRAME_WINDOW_P (f)) | 896 | if (FRAME_WINDOW_P (f)) |
| 897 | { | 897 | { |
| 898 | font_object = font_range (charpos, bytepos, &to, win, face, string); | 898 | font_object = font_range (charpos, bytepos, &to, win, face, string); |