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

Fix --without-x build.

Browse source 
src/xdisp.c (init_iterator): Don't reference tip_frame in a build
 --without-x.  (Bug#11742)
This commit is contained in:
Eli Zaretskii 2012-07-28 10:59:34 +03:00
parent 73e0cbc0f5
commit df81cd291b
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-07-28 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (init_iterator): Don't reference tip_frame in a build
--without-x. (Bug#11742)
2012-07-27 Paul Eggert <eggert@cs.ucla.edu>
Adjust GDB to reflect pvec_type changes (Bug#12036).

6
src/xdisp.c
View file

@ -2736,7 +2736,11 @@ init_iterator (struct it *it, struct window *w,
frames when the fringes are turned off. But leave the dimensions
zero for tooltip frames, as these glyphs look ugly there and also
sabotage calculations of tooltip dimensions in x-show-tip. */
if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame)))
#ifdef HAVE_WINDOW_SYSTEM
if (!(FRAME_WINDOW_P (it->f)
&& FRAMEP (tip_frame)
&& it->f == XFRAME (tip_frame)))
#endif
{
if (it->line_wrap == TRUNCATE)
{