From: Joakim Verona <joakim@verona.se>
Date: Tue, 28 Apr 2015 16:24:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into xwidget_mvp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cefb1b7afd86ccd72528f9adc10603847decc9d;p=emacs.git

Merge remote-tracking branch 'origin/master' into xwidget_mvp

Conflicts:
	src/print.c
---

5cefb1b7afd86ccd72528f9adc10603847decc9d
diff --cc src/print.c
index fd943b94efd,206466ce68f..d826fb764f9
--- a/src/print.c
+++ b/src/print.c
@@@ -37,10 -37,7 +37,11 @@@ along with GNU Emacs.  If not, see <htt
  #include "termhooks.h"		/* For struct terminal.  */
  #include "font.h"
  
 +#ifdef HAVE_XWIDGETS
 +# include "xwidget.h"
 +#endif
 +
+ #include <c-ctype.h>
  #include <float.h>
  #include <ftoastr.h>