Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c

diff --cc configure.ac
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
index ab73b6403ee3129f6075f3d295183d0adf12acfb,1eb097f05abd77c872af7a074141483a34a44271..7db0a46d6da141297f85bf72daf14fb6aa0e02dc
--- 1/src/dispnew.c
--- 2/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/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
index f5ee47dc1142568580a0c81539dc1a9a76f3d816,8ea76d9885446c9ab0a6566c81231af4799e06fa..1257b46dda4c51d5883c917069d5f00ebffbd8e6
--- 1/src/print.c
--- 2/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))
            {

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge