[Emacs-diffs] /srv/bzr/emacs/trunk r108947: * xdisp.c (display_line): Avoid warning about implicit declaration

[Andreas Schwab]

------------------------------------------------------------
revno: 108947
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2012-07-07 23:39:45 +0200
message:
  * xdisp.c (display_line): Avoid warning about implicit declaration
  of FRAME_FONT.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-07 21:39:23 +0000
+++ b/src/ChangeLog     2012-07-07 21:39:45 +0000
@@ -1,5 +1,8 @@
 2012-07-07  Andreas Schwab  <address@hidden>
 
+       * 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.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-07-07 16:36:02 +0000
+++ b/src/xdisp.c       2012-07-07 21:39:45 +0000
@@ -19770,6 +19770,7 @@
                      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 @@
                    }
                  produce_special_glyphs (it, IT_TRUNCATION);
                }
+#endif
            }
          else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
            {