projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b598d3
)
Pacify --enable-gcc-warnings --with-x-toolkit=no
author
Paul Eggert
<eggert@cs.ucla.edu>
Wed, 17 May 2017 17:25:21 +0000
(10:25 -0700)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Wed, 17 May 2017 17:59:02 +0000
(10:59 -0700)
* src/composite.c (autocmp_chars) [!HAVE_WINDOW_SYSTEM]:
Avoid unused local.
src/composite.c
patch
|
blob
|
history
diff --git
a/src/composite.c
b/src/composite.c
index b673c53ac8328cc2de541c43249856f6b2de8b57..05a296329a6507819907070895b2a5ab3ad630f6 100644
(file)
--- 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);