procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xdisp.c (display_line): Avoid warning about implicit declaration

Browse source 
of FRAME_FONT.
This commit is contained in:
Andreas Schwab 2012-07-07 23:39:45 +02:00
parent 298819b917
commit f17c527307
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-07-07 Andreas Schwab <schwab@linux-m68k.org>
* xdisp.c (display_line): Avoid warning about implicit declaration
of FRAME_FONT.
* frame.c (get_frame_param): Define only if HAVE_WINDOW_SYSTEM.
* lisp.h: Remove empty conditional.

2
src/xdisp.c
View file

@ -19770,6 +19770,7 @@ display_line (struct it *it)
produce_special_glyphs (it, IT_TRUNCATION);
}
}
#ifdef HAVE_WINDOW_SYSTEM
else
{
int stretch_width = it->last_visible_x - it->current_x;
@ -19793,6 +19794,7 @@ display_line (struct it *it)
}
produce_special_glyphs (it, IT_TRUNCATION);
}
#endif
}
else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
{