From: Joakim Verona <joakim@verona.se>
Date: Sun, 14 Jul 2013 09:04:49 +0000 (+0200)
Subject: Merge branch 'trunk' into xwidget
X-Git-Tag: emacs-25.0.90~2892
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bb9bb0841d89fff09820a57369df4cb01b16b43;p=emacs.git

Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c
---

0bb9bb0841d89fff09820a57369df4cb01b16b43
diff --cc src/dispnew.c
index ab73b6403ee,1eb097f05ab..7db0a46d6da
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@@ -239,9 -237,11 +240,10 @@@ add_window_display_history (struct wind
     PAUSED_P means that the update has been interrupted for
     pending input.  */
  
 -static void
 -add_frame_display_history (struct frame *f, bool paused_p)
 +static void add_frame_display_history (struct frame *f, int paused_p)
  {
    char *buf;
+   void *ptr = f;
  
    if (history_idx >= REDISPLAY_HISTORY_SIZE)
      history_idx = 0;
diff --cc src/print.c
index f5ee47dc114,8ea76d98854..1257b46dda4
--- a/src/print.c
+++ b/src/print.c
@@@ -1765,18 -1763,10 +1765,17 @@@ print_object (Lisp_Object obj, Lisp_Obj
  	  strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun);
  	  PRINTCHAR ('>');
  	}
 +#ifdef HAVE_XWIDGETS
 +      else if (XXWIDGETP (obj))
 +	{
 +	  strout ("#<xwidget ", -1, -1, printcharfun);
 +	  PRINTCHAR ('>');
 +	}
 +#endif      
        else if (WINDOWP (obj))
  	{
- 	  int len;
- 	  strout ("#<window ", -1, -1, printcharfun);
- 	  len = sprintf (buf, "%p", XWINDOW (obj));
+ 	  void *ptr = XWINDOW (obj);
+ 	  int len = sprintf (buf, "#<window %p", ptr);
  	  strout (buf, len, len, printcharfun);
  	  if (BUFFERP (XWINDOW (obj)->contents))
  	    {