14 files changed, 382 insertions, 384 deletions

diff --git a/README.xwidget b/README.xwidget
index 296be30bb6d..cee891931d2 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -41,7 +41,36 @@ If that didnt work out try the minimal demonstration instead:
 (load-library "xwidget-test")
 (xwidget-demo-a-button)
 
-It looks unimpressive, but it's a gtk button inside an Emars buffer!
+It looks unimpressive, but it's a gtk button inside an Emacs buffer!
+*** webkit hints
+If you got webkit working, great! Please note, though, that the
+current support is far from a full fledged browser. My focus is on
+delivering a component that can be used to build a full emacs based
+browser on. Since I implement a browse-url function you can get quite
+far just by:
+
+(setq browse-url-browser-function 'xwidget-webkit-browse-url)
+
+then all Emacs browser interface systems work to a degree.
+heres stuff I use currenly
+
+- m-x anything-surfraw interfaces to search engines
+- C-o in org mode opens links inside org
+- m-x ffap opens links anywhere in a buffer
+- m-x gtk-lookup-symbol searches gtk docs
+- m-x bookmark-jump
+etc..
+
+I'll add more examples as I go along.
+
+However theres lots of support missing, see TODO list for
+information. Briefly:
+- download handling
+- keyboard field navigation
+- isearch
+- history
+- sites that use flash. I dont really care about this issue so its
+unlikely to be fixed. Just a heads up.
 
 ** Stability
 Beginning with Summer 2011 I am now able to use Xwidget Emacs as my
@@ -173,20 +202,6 @@ socket window is copied efficientlp by means of composition to a
 number of other windows, that then are plugged into the different
 Emacs sockets. 
 * ToDo:s
-** DONE webkit flashkiller by default
-   CLOSED: [2011-07-19 Tue 14:27]
-while its possible to support plugins in the webkit xwidget, flash has
-issues on 64 bit, and slows down emacs to a halt with off screen
-rendering, and of course is not free software. its in the way for real
-world usage even if its interesting to watch flash animations inside
-emacs. which should be achieved with Gnash or other free software
-instead.
-
-http://stackoverflow.com/questions/4885513/prevent-flash-in-cocoa-webview
-
-simply use this api:
-http://webkitgtk.org/reference/WebKitWebPluginDatabase.html
-
 ** DONE allow xwidgets to report thoir size
    CLOSED: [2011-07-19 Tue 14:26]
 now we just hard code sizes. but webkit widgets for instance can
@@ -522,171 +537,6 @@ buffer. how do we catch these errors?
 so turned out this got solved by using proper lisp objects for
 xwidgets. yay!
 
-
-** DONE browser xwidget
-   CLOSED: [2011-07-20 Wed 20:05]
-although embedding a browser is not my primary concern many are
-interested in this. some suitable browser component needs to be found
-supporting gtk.
-
-*** DONE webkit
-    CLOSED: [2011-07-03 Sun 22:13]
-there is a webkit gtk port. there is no obvious mvc support.
-http://live.gnome.org/WebKitGtk
-http://webkitgtk.org/
-
-it might be possible to keep a set of webxits in artificial
-synchronisation by recursive deep copy of the DOM from one webkit to
-another. This will be error prone at best though. Another way might be
-to just use bitmap copy of the "live"instance to the "phantom"
-instances. the problem of transfering the live view remains though.
-
-export CFLAGS="`pkg-config --cflags webkit-1.0` -DHAVE_WEBKIT -g"
-export LDFLAGS=`pkg-config --libs webkit-1.0`
-./configure
-make
-
-**** off screen rendering
-export CFLAGS="`pkg-config --cflags webkit-1.0` -DHAVE_WEBKIT_OSR -g"
-export LDFLAGS=`pkg-config --libs webkit-1.0`
-./configure
-make
-
-works a little bit  but i get errors like:
-
-(emacs:8362): GLib-GObject-WARNING **: invalid cast from `GdkOffscreenWindow' to `GdkDrawableImplX11'
-
-set a breakpoint in g_log, backtrace seems to indicate
-webkitViewportAttributesRecompute is the offender. 
-
-maybe try gtk3 variants?
-
-export CFLAGS="`pkg-config --cflags webkitgtk-3.0 ` -DHAVE_WEBKIT_OSR "
-export LDFLAGS=`pkg-config --libs webkitgtk-3.0 `
-./configure   --with-x-toolkit=gtk3
-make
-
-crash in gtk_window_get_size instead. great.
-
-http://gtkplus-p3.0.sourcearchive.com/documentation/2.91.5-0ubuntu1/testoffscreenwindow_8c-source.html
-
-after many atempts, the basic issue remains. for some reason the
-offscreen widget isnt ok when I want to snapshot it, so i simply get
-emptiness. the surface is only ok someimes. 
-
-here is a useful debugging snippets:
-  // debugging redraw:
-  //  - the bg colors always change, so theres no error in signal handling
-  //  - i get this error now and then:
-  //(emacs:7109): GLib-GObject-WARNING **: invalid cast from `GdkOffscreenWindow' to `GdkDrawableImplX11'
-  // seems to happen in webkit actually. see README
-  
-  if(0){ //redraw debug hack. helped a lot in fact. use the with alpha painter below also
-    cairo_set_source_rgb(cr, osr_dbg_color, 1.0, 0.2);
-    cairo_rectangle(cr, 0,0, xw->width, xw->height);
-    cairo_fill(cr);
-    osr_dbg_color+=0.1;
-    if(osr_dbg_color>1.0)
-      osr_dbg_color=0.0;
-    
-  }
-
-you need to terminate drawing like this:
-  
-  //cairo_set_source_surface (cr, src_pixmap, 0,0); 
-  //cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
-  //cairo_paint_with_alpha (cr, 1.0);
-  //cairo_paint(cr);
-
-the snippets change background color on oach redraw. 
-
-**** on-screen rendering to separate window
-an alternative might be to open a separate window and snapshot it. the
-idea is that whatever oddness webkit does so that offscreen rendering
-doesnt work, doesnt happen on-screen. the window could be opened
-somewhere not in the way.
-
-*** CANCELLED firefox
-    CLOSED: [2011-07-03 Sun 22:13]
-http://www-archive.mozilla.org/unix/gtk-embedding.html
-seems to be severly bitrotted
-
-heres a newer aproach
-http://hg.mozilla.org/incubator/embedding/file/29ac0fe51754/gtk/tests/test.cpp
-
-while webkit clearly has the best traction as an embeddee, the
-offscreen rendering issues makes it interesting to see what ff brings
-to the table. turns out webkit has as good offscreen support as anyone.
-
-
-*** DONE text field support
-    CLOSED: [2011-07-20 Wed 20:05]
-Emacs captures all keyboard events so text field support isn't super
-straightforward. 
-
-**** propagate keyboard events
-I have some old hacks for this and they are not good.
-**** use the DOM model
-expose document.activeElement to lisp. This is potentially more
-interesting than just forwarding keyboard events.
-
-webkit_web_view_get_dom_document ()
-
-this is hard it seems. an idea might be to hack elisp support for swig
-to machine generate the bindings. 
-**** DONE inject javascript
-     CLOSED: [2011-07-03 Sun 22:50]
-webkit_web_view_execute_script ()
-
-this works now:
-(xwidget-webkit-execute-script 5 "document.activeElement.value='test'")
-
-so it should be possible to do some interesting stuff.
-execute-script does however not return anything at the interface level
-so satisfaction is not total:
-
-http://markmail.org/message/4yowmdgras73z3x5
-
-maybe
-https://launchpad.net/gnome-seed
-
-or this funny hack:
-<jave> im trying to understanh how to interact via javascript to an embedded
-       webkit gtk instance  [23:38]
-<jave> i use webkit_web_view_execute_script() which is nice but doesnt return
-       a value, by design aparently  [23:39]
-<jave> any hints?
-<lucian> jave: afaik, webkit still doesn't have full gobject bindings  [23:48]
-<lucian> jave: you can hack it up by making the JS modify the title, and read
-         the title from gtk-side
-<jave> lucian: that was a pretty cool idea!
-
-
-*** webkit_web_view_load_string ()
-I would like preview of html in a buffer rather than from uri.
-
-
-
-*** TODO simple xwidget-webkit wrapper
-so that it could be used for actual browsing :)
-I dont want to reinvent too many wheels so i'd like to use existing
-emacs facilities here possible. use bindings similar to w3m(or info)
-
-- m-x xwidget-webkit starts a session
-- 'g' goes to a url
-- use bookmark-jump i suppose. I mostly use org for bookmarks myself
-- browse-url support so webkit can be the default browser
-- some way of getting around the quirky keyboard interaction since
-  xwidgets dont receive keyboard events because I hawe no idea how to
-  do that in a sane way
-
-... and one can of course go on bikeshedding forever. lets keep it
-simple and extensible, and compatible with other Emacs packages.
-
-the really cool ideas would need Emacs DOM integration, which is not
-easy. 
-
 ** DONE clipping of controllers
    CLOSED: [2011-07-05 Tue 11:33]
 
@@ -840,7 +690,6 @@ support a chain of redirects, which seems unlikely. the benefit would
 be that I dont have to spend time optimizing redrawing.
 
 
-
 ** DONE remove xwidget_views when emacs window is deleted
    CLOSED: [2011-07-05 Tue 11:29]
 removing xwidget views when an Emacs window closes is not reliable.
@@ -852,6 +701,171 @@ removing xwidget views when an Emacs window closes is not reliable.
 this seems to work
 
 
+** browser xwidget
+although embedding a browser is not my primary concern many are
+interested in this. some suitable browser component needs to be found
+supporting gtk.
+
+*** DONE webkit
+    CLOSED: [2011-07-03 Sun 22:13]
+there is a webkit gtk port. there is no obvious mvc support.
+http://live.gnome.org/WebKitGtk
+http://webkitgtk.org/
+
+it might be possible to keep a set of webxits in artificial
+synchronisation by recursive deep copy of the DOM from one webkit to
+another. This will be error prone at best though. Another way might be
+to just use bitmap copy of the "live"instance to the "phantom"
+instances. the problem of transfering the live view remains though.
+
+export CFLAGS="`pkg-config --cflags webkit-1.0` -DHAVE_WEBKIT -g"
+export LDFLAGS=`pkg-config --libs webkit-1.0`
+./configure
+make
+
+**** off screen rendering
+export CFLAGS="`pkg-config --cflags webkit-1.0` -DHAVE_WEBKIT_OSR -g"
+export LDFLAGS=`pkg-config --libs webkit-1.0`
+./configure
+make
+
+works a little bit  but i get errors like:
+
+(emacs:8362): GLib-GObject-WARNING **: invalid cast from `GdkOffscreenWindow' to `GdkDrawableImplX11'
+
+set a breakpoint in g_log, backtrace seems to indicate
+webkitViewportAttributesRecompute is the offender. 
+
+maybe try gtk3 variants?
+
+export CFLAGS="`pkg-config --cflags webkitgtk-3.0 ` -DHAVE_WEBKIT_OSR "
+export LDFLAGS=`pkg-config --libs webkitgtk-3.0 `
+./configure   --with-x-toolkit=gtk3
+make
+
+crash in gtk_window_get_size instead. great.
+
+http://gtkplus-p3.0.sourcearchive.com/documentation/2.91.5-0ubuntu1/testoffscreenwindow_8c-source.html
+
+after many atempts, the basic issue remains. for some reason the
+offscreen widget isnt ok when I want to snapshot it, so i simply get
+emptiness. the surface is only ok someimes. 
+
+here is a useful debugging snippets:
+  // debugging redraw:
+  //  - the bg colors always change, so theres no error in signal handling
+  //  - i get this error now and then:
+  //(emacs:7109): GLib-GObject-WARNING **: invalid cast from `GdkOffscreenWindow' to `GdkDrawableImplX11'
+  // seems to happen in webkit actually. see README
+  
+  if(0){ //redraw debug hack. helped a lot in fact. use the with alpha painter below also
+    cairo_set_source_rgb(cr, osr_dbg_color, 1.0, 0.2);
+    cairo_rectangle(cr, 0,0, xw->width, xw->height);
+    cairo_fill(cr);
+    osr_dbg_color+=0.1;
+    if(osr_dbg_color>1.0)
+      osr_dbg_color=0.0;
+    
+  }
+
+you need to terminate drawing like this:
+  
+  //cairo_set_source_surface (cr, src_pixmap, 0,0); 
+  //cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+  //cairo_paint_with_alpha (cr, 1.0);
+  //cairo_paint(cr);
+
+the snippets change background color on oach redraw. 
+
+**** on-screen rendering to separate window
+an alternative might be to open a separate window and snapshot it. the
+idea is that whatever oddness webkit does so that offscreen rendering
+doesnt work, doesnt happen on-screen. the window could be opened
+somewhere not in the way.
+
+*** CANCELLED firefox
+    CLOSED: [2011-07-03 Sun 22:13]
+http://www-archive.mozilla.org/unix/gtk-embedding.html
+seems to be severly bitrotted
+
+heres a newer aproach
+http://hg.mozilla.org/incubator/embedding/file/29ac0fe51754/gtk/tests/test.cpp
+
+while webkit clearly has the best traction as an embeddee, the
+offscreen rendering issues makes it interesting to see what ff brings
+to the table. turns out webkit has as good offscreen support as anyone.
+
+
+*** DONE text field support
+    CLOSED: [2011-07-20 Wed 20:05]
+Emacs captures all keyboard events so text field support isn't super
+straightforward. 
+
+**** propagate keyboard events
+I have some old hacks for this and they are not good.
+**** use the DOM model
+expose document.activeElement to lisp. This is potentially more
+interesting than just forwarding keyboard events.
+
+webkit_web_view_get_dom_document ()
+
+this is hard it seems. an idea might be to hack elisp support for swig
+to machine generate the bindings. 
+**** DONE inject javascript
+     CLOSED: [2011-07-03 Sun 22:50]
+webkit_web_view_execute_script ()
+
+this works now:
+(xwidget-webkit-execute-script 5 "document.activeElement.value='test'")
+
+so it should be possible to do some interesting stuff.
+execute-script does however not return anything at the interface level
+so satisfaction is not total:
+
+http://markmail.org/message/4yowmdgras73z3x5
+
+maybe
+https://launchpad.net/gnome-seed
+
+or this funny hack:
+<jave> im trying to understanh how to interact via javascript to an embedded
+       webkit gtk instance  [23:38]
+<jave> i use webkit_web_view_execute_script() which is nice but doesnt return
+       a value, by design aparently  [23:39]
+<jave> any hints?
+<lucian> jave: afaik, webkit still doesn't have full gobject bindings  [23:48]
+<lucian> jave: you can hack it up by making the JS modify the title, and read
+         the title from gtk-side
+<jave> lucian: that was a pretty cool idea!
+
+
+*** webkit_web_view_load_string ()
+I would like preview of html in a buffer rather than from uri.
+
+
+
+*** DONE simple xwidget-webkit wrapper
+    CLOSED: [2011-07-22 Fri 11:01]
+so that it could be used for actual browsing :)
+I dont want to reinvent too many wheels so i'd like to use existing
+emacs facilities here possible. use bindings similar to w3m(or info)
+
+- m-x xwidget-webkit starts a session
+- 'g' goes to a url
+- use bookmark-jump i suppose. I mostly use org for bookmarks myself
+- browse-url support so webkit can be the default browser
+- some way of getting around the quirky keyboard interaction since
+  xwidgets dont receive keyboard events because I hawe no idea how to
+  do that in a sane way
+
+... and one can of course go on bikeshedding forever. lets keep it
+simple and extensible, and compatible with other Emacs packages.
+
+the really cool ideas would need Emacs DOM integration, which is not
+easy. 
+
+
 ** TODO support webkit signals
 *** TODO particularily document-load-finished
 http://webkitgtk.org/reference/webkitgtk-webkitwebview.html#WebKitWebView-document-load-finished
@@ -865,11 +879,26 @@ prints hello to stdout but theres no way to catch stdout from webkit I
 think other than receiving the signal.
 
 
+** DONE webkit flashkiller by default
+   CLOSED: [2011-07-19 Tue 14:27]
+while its possible to support plugins in the webkit xwidget, flash has
+issues on 64 bit, and slows down emacs to a halt with off screen
+rendering, and of course is not free software. its in the way for real
+world usage even if its interesting to watch flash animations inside
+emacs. which should be achieved with Gnash or other free software
+instead.
+
+http://stackoverflow.com/questions/4885513/prevent-flash-in-cocoa-webview
+
+simply use this api:
+http://webkitgtk.org/reference/WebKitWebPluginDatabase.html
+
 
 ** TODO webkit downloads
 when clicking a download link in Webkit Emacs should take over and handle it
-from there. Probably need signals.
-
+from there. Probably need signals. There are Emacs libraries to
+download things, with wget etc.
+"download-requested"
 ** TODO webkit alt-text not handled
 XKCD use image-title to display a cartoon comment. These mysteriously
 don't work ATM. Other mouseovers work though. Maybe webkit tries to
@@ -880,6 +909,36 @@ have a look at how docview solves it
 webkit_web_view_search_text ()
 ** TODO webkit relative references doesn't work
 probably because we handle scrolling in a non-standard way
+** TODO webkit width adjustment handling issue
+since there are so many levels of clipping and whatnot in xwidgets
+sizing issues are difficult.
+
+- an xwidget is told how large it can be by emacs. thats the end of
+  it. if the xwidget thinks otherwise it will be clipped.
+- but emacs can ask the xwudget how large it wants to be. it can then
+  resize the reserved area and inform the xwidget thusly. 
+
+That should have been enough. but webkit never reports less than what
+it already has. So currently a webkit view will only growth and not
+adjust to smaller sizes. 
+
+This is not a big problem in practice but is still annoying.
+
+to see the problem surface to http://www.slashdot.org
+- xwidget-webkit-adjust-size
+- xwidget-webkit-adjust-size-to-content
+
+and then try resizing Epiphany.
+
+
+** TODO synchronise emacs background with xwidget color
+fine-tuning to reduce flicker.
+
+** TODO xwidget allow loading from string from emacs
+
+
+** TODO xwidgets doesn't work during bootstrap all of a sudden
+
 * old notes from x_draw_xwidget_glyph_string
 
     BUG it seems this method for some reason is called with bad s->x and s->y sometimes.
@@ -922,3 +981,4 @@ probably because we handle scrolling in a non-standard way
    this means valid cases like xwidgets being displayed only once in
    non-selected windows, does not work well. they should also be visible
    in that case not phantomed.
+
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d96ad569543..a2169898670 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-pop-up-window)
+        (display-buffer-pop-up-side-window)
+        (display-buffer-in-side-window): Call display-buffer-set-height
+        and display-buffer-set-width after setting the new window's
+        buffer so `fit-window-to-buffer' and friends work on the right
+        buffer.
+
 2011-07-20  Sam Steingold  <sds@gnu.org>
 
         * progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a1cb003a8ff..a8065fc5ca4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-tag-comment): Ignore HTML comments.
+
 2011-07-20  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnir.el (gnus-group-make-nnir-group): Allow optional search query
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f8a85579b4f..8faa5071616 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -761,6 +761,9 @@ ones, in case fg and bg are nil."
 (defun shr-tag-script (cont)
   )
 
+(defun shr-tag-comment (cont)
+  )
+
 (defun shr-tag-sup (cont)
   (let ((start (point)))
     (shr-generic cont)
diff --git a/lisp/window.el b/lisp/window.el
index 12c9da85d57..905db8dc9b6 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5051,14 +5051,22 @@ description."
                       (funcall side window)))))
 
             (when (window-live-p window)
-              ;; Adjust sizes if asked for.
-              (display-buffer-set-height window specifiers)
-              (display-buffer-set-width window specifiers)
+              ;; In `quit-restore' parameter record that we popped up
+              ;; this window, its buffer and which window was selected.
               (set-window-parameter
                window 'quit-restore (list 'new-window buffer selected-window))
+              ;; For `display-buffer-window' mark window as new.
               (setq display-buffer-window (cons window 'new-window))
+              ;; Install BUFFER in the new window.
               (display-buffer-in-window buffer window specifiers)
+              ;; Adjust sizes if asked for (for `fit-window-to-buffer'
+              ;; and friends BUFFER must be already shown in the new
+              ;; window).
+              (display-buffer-set-height window specifiers)
+              (display-buffer-set-width window specifiers)
+              ;; Reset list of window's previous buffers to nil.
               (set-window-prev-buffers window nil)
+              ;; Return the new window.
               (throw 'done window))))))))
 
 (defun display-buffer-pop-up-frame (buffer &optional graphic-only specifiers)
@@ -5113,26 +5121,33 @@ failed."
           (display-buffer-split-window main-or-root on-side specifiers))
          fun)
     (when window
+      ;; We were able to split off a new window.
       (unless main
         (walk-window-subtree
          (lambda (window)
            ;; Make all main-or-root subwindows main windows.
            (set-window-parameter window 'window-side 'none))
          main-or-root t))
-      ;; Make sure that parent's window-side is nil.
+      ;; Reset window-side parameter of new window's parent to nil.
       (set-window-parameter (window-parent window) 'window-side nil)
-      ;; Initialize side.
+      ;; Initialize window-side parameter of new window to SIDE.
       (set-window-parameter window 'window-side side)
-      ;; Adjust sizes if asked for.
-      (display-buffer-set-height window specifiers)
-      (display-buffer-set-width window specifiers)
-      ;; Set window parameters.
+      ;; Install window-slot parameter of new window.
+      (set-window-parameter window 'window-slot slot)
+      ;; In `quit-restore' parameter record that we popped up a new
+      ;; window.
       (set-window-parameter
        window 'quit-restore (list 'new-window buffer selected-window))
+      ;; For `display-buffer-window' mark window as new.
       (setq display-buffer-window (cons window 'new-window))
-      (set-window-parameter window 'window-slot slot)
+      ;; Install BUFFER in new window.
       (display-buffer-in-window buffer window specifiers)
+      ;; Adjust sizes of new window if asked for.
+      (display-buffer-set-height window specifiers)
+      (display-buffer-set-width window specifiers)
+      ;; Reset list of new window's previous buffers to nil.
       (set-window-prev-buffers window nil)
+      ;; Return the new window.
       window)))
 
 (defun display-buffer-in-side-window (buffer side &optional slot specifiers)
@@ -5160,7 +5175,7 @@ SPECIFIERS must be a list of buffer display specifiers."
                 window-sides-slots))
          (selected-window (selected-window))
          window this-window this-slot prev-window next-window
-         best-window best-slot abs-slot dedicated)
+         best-window best-slot abs-slot dedicated new-window)
 
     (unless (numberp slot)
       (setq slot 0))
@@ -5233,13 +5248,16 @@ SPECIFIERS must be a list of buffer display specifiers."
                           (setq window (display-buffer-split-window
                                         prev-window prev-side specifiers)))))
                (progn
-                 (display-buffer-set-height window specifiers)
-                 (display-buffer-set-width window specifiers)
+                 ;; In `quit-restore' parameter record that we popped up
+                 ;; this window, its buffer and the old selected window.
                  (set-window-parameter
                   window 'quit-restore
                   (list 'new-window buffer selected-window))
+                 ;; For `display-buffer-window' mark window as new.
                  (setq display-buffer-window (cons window 'new-window))
-                 window))
+                 ;; Record that window is new, we need this for
+                 ;; adjusting sizes below.
+                 (setq new-window window)))
           (and best-window
                (setq window best-window)
                ;; Reuse best window (the window nearest to SLOT).
@@ -5262,7 +5280,17 @@ SPECIFIERS must be a list of buffer display specifiers."
         (unless (window-parameter window 'window-slot)
           ;; Don't change exisiting slot value.
           (set-window-parameter window 'window-slot slot))
-        (display-buffer-in-window buffer window specifiers)))))
+        ;; Install BUFFER in the window.
+        (display-buffer-in-window buffer window specifiers)
+        (when new-window
+          ;; Adjust sizes if asked for (for `fit-window-to-buffer' and
+          ;; friends BUFFER must be already shown in the new window).
+          (display-buffer-set-height window specifiers)
+          (display-buffer-set-width window specifiers)
+          ;; Reset list of new window's previous buffers to nil.
+          (set-window-prev-buffers window nil))
+        ;; Return the window used.
+        window))))
 
 (defun window-normalize-buffer-to-display (buffer-or-name)
   "Normalize BUFFER-OR-NAME argument for buffer display functions.
@@ -6926,7 +6954,7 @@ WINDOW was scrolled."
     ;; `with-selected-window' should orderly restore the current buffer.
     (with-selected-window window
       ;; We are in WINDOW's buffer now.
-      (let* ( ;; Adjust MIN-HEIGHT.
+      (let* (;; Adjust MIN-HEIGHT.
              (min-height
               (if override
                   (window-min-size window nil window)
diff --git a/lisp/xwidget-screencast.el b/lisp/xwidget-screencast.el
deleted file mode 100644
index f85dbe8f247..00000000000
--- a/lisp/xwidget-screencast.el
+++ /dev/null
@@ -1,32 +0,0 @@
-;;(require 'screencast)
-(require 'xwidget)
-(defconst xwidget-screencast-webkit '("Hello, and welcome to a
-  short demo of the Emacs xwidget branch, and the Webkit
-  integration it provides." n
-  "Xwidgets are toolkit widgets that behave like images in an
-  Emacs buffer. Except they are actual widgets, so you can
-  interact with them." n
-  "There are several, but people seem to fancy the webkit the most so lets have a look!"
-  (insert "some text")
-  (xwidget-insert (point-min)  'webkit-osr "webkit-osr" 500  1000  5)
-  n
-  "Okay so thats an actual webkit instance in an Emacs buffer! " n
-  "Mouse-overs work" n
-  "Mouse-clicks work" n
-  (split-window-vertically)
-  "You can split the buffer and scroll the windows separately, as
-  usual in Emacs. This is however not so usual in the browser
-  world for some reason." n
-  "So, can you use the xwidget branch as your main Emacs instance?"n
-  "Not yet, its still not mature. There are many tricky issues
-  left. That being said, there are many simple tasks to help out
-  with also if you like!" ))
-
-
-(defun xwidget-screencast(&optional arg)
-  "Displays the screencast for xwidgets."
-  (interactive "P")
-  (apply (if arg
-             'screencast-record
-           'screencast)
-          xwidget-screencast-webkit "xvidgets" 1 ()))
diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
deleted file mode 100644
index 087892244df..00000000000
--- a/lisp/xwidget-test.el
+++ /dev/null
@@ -1,138 +0,0 @@
-;;test like:
-;; cd /path/to/xwidgets-emacs-dir
-;; make   all&&  src/emacs -q --eval "(progn (load \"`pwd`/lisp/xwidget-test.el\") (xwidget-demo-basic))"
-
-
-;; you should see:
-;; - a gtk button
-;; - a gtk toggle button
-;; - a gtk slider button
-;; - an xembed window(using gtk_socket) showing another emacs instance
-;; - an xembed window(using gtk_socket) showing an uzbl web browser if its installed
-
-;;the widgets will move when you type in the buffer. good!
-
-;;there will be redrawing issues when widgets change rows, etc. bad!
-
-;;its currently difficult to give kbd focus to the xembedded emacs,
-;;but try evaling the following:
-
-;; (xwidget-set-keyboard-grab 3 1)
-
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; demo/test functions
-(require 'xwidget)
-
-(defmacro xwidget-demo (name &rest body)
-  `(defun ,(intern (concat "xwidget-demo-" name)) ()
-     (interactive)
-     (switch-to-buffer ,(format "*xwidget-demo-%s*" name))
-     (text-mode);;otherwise no local keymap
-     (insert "Some random text for xwidgets to be inserted in for demo purposes.\n")
-     ,@body))
-
-(xwidget-demo "a-button" 
-              (xwidget-insert (point-min) 'button  "button" 40  50)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-big-button" 
-              (xwidget-insert (point-min)  'button "button" 400  500)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-socket" 
-              (xwidget-insert (point-min)  'socket "socket" 500  500)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-
-(xwidget-demo "a-slider" 
-              (xwidget-insert (point-min)  'slider "slider" 500  100)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-canvas" 
-              (xwidget-insert (point-min)  'cairo "canvas" 1000  1000)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-webkit" 
-              (xwidget-insert (point-min)  'webkit "webkit" 1000  1000)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-(xwidget-demo "a-webkit-osr" 
-              (xwidget-insert (point-min)  'webkit-osr "webkit-osr" 1000  1000)
-              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
-
-
-
-(xwidget-demo "basic"
-  (xwidget-insert (point-min)  'button "button" 40  50 )
-  (xwidget-insert          15  'toggle "toggle" 60  30  )
-  (xwidget-insert          30  'socket "emacs"  400 200 )
-  (xwidget-insert          20  'slider "slider" 100 50  )
-  (xwidget-insert          40  'socket "uzbl-core"   400 400 )
-  (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic)
-)
-
-
-;it doesnt seem gtk_socket_steal works very well. its deprecated.
-; xwininfo -int
-; then (xwidget-embed-steal 3 <winid>)
-(defun xwidget-demo-grab ()
-  (interactive)
-  (insert "0 <<< grabbed appp will appear here\n")
-  (xwidget-insert          1 1 3 "1" 1000 )
-  (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-grab)  
-  )
-
-;ive basically found these xembeddable things:
-;openvrml
-;emacs
-;mplayer
-;surf
-;uzbl
-
-;try the openvrml:
-;/usr/libexec/openvrml-xembed 0 ~/Desktop/HelloWorld.wrl
-
-
-(defun xwidget-handler-demo-basic ()
-  (interactive)
-  (message "stuff happened to xwidget %S" last-input-event)
-  (let*
-      ((xwidget-event-type (nth 2 last-input-event))
-       (xwidget-id (nth 1 last-input-event)))
-    (cond ( (eq xwidget-event-type 'xembed-ready)
-            (let*
-                ((xembed-id (nth 3 last-input-event)))
-              (message "xembed ready  event: %S xw-id:%s" xembed-id xwidget-id)
-              ;;will start emacs/uzbl in a xembed socket when its ready
-              (cond
-               ((eq 3 xwidget-id)
-                (start-process "xembed" "*xembed*" (format "%ssrc/emacs" default-directory) "-q" "--parent-id" (number-to-string xembed-id) ) )
-               ((eq 5 xwidget-id)
-                (start-process "xembed2" "*xembed2*" "uzbl-core"  "-s" (number-to-string xembed-id)  "http://www.fsf.org" )  )
-               
-              )
-            )))))
-
-
-
-(defun xwidget-handler-demo-grab ()
-  (interactive)
-  (message "stuff happened to xwidget %S" last-input-event)
-  (let*
-      ((xwidget-event-type (nth 2 last-input-event)))
-    (cond ( (eq xwidget-event-type 'xembed-ready)
-            (let*
-                ((xembed-id (nth 3 last-input-event)))
-              (message "xembed ready  %S" xembed-id)
-              )
-            ))))
-(defun xwidget-dummy-hook ()
-  (message "xwidget dummy hook called"))
-
-;  (xwidget-resize-hack 1 200 200)
-
-;(xwidget-demo-basic)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 837f8454671..7f1ffd56fb9 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -110,6 +110,10 @@ defaults to the string looking like a url around the cursor position."
   (interactive)
   ( xwidget-adjust-size-to-content ( xwidget-webkit-last-session)))
 
+(defun xwidget-webkit-adjust-size (w h)
+  (interactive "nWidth:\nnHeight:\n")
+  ( xwidget-resize ( xwidget-webkit-last-session) w h))
+
 
 (defun xwidget-webkit-new-session (url)
 
diff --git a/src/ChangeLog b/src/ChangeLog
index e098e536efb..65cd07df0ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2011-07-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (Fmodify_frame_parameters): In tty case, update the
+        default face if necessary (Bug#4238).
+
+2011-07-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * editfns.c (Fstring_to_char): No need to explain what a character
+        is in the docstring (Bug#6576).
+
+2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c (parse_region): Make sure we always return a tree.
+
+2011-07-20  HAMANO Kiyoto  <khiker.mail@gmail.com>
+
+        * xml.c (parse_region): If a document contains only comments,
+        return that, too.
+
+2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c (make_dom): Return comments, too.
+
 2011-07-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port to OpenBSD.
diff --git a/src/dispnew.c b/src/dispnew.c
index e1311634e2c..804ca14d936 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -15,7 +15,6 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/src/editfns.c b/src/editfns.c
index b20c38faacd..56ad99d199f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -194,12 +194,7 @@ DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0,
 }
 
 DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0,
-       doc: /* Return the first character in STRING.
-A multibyte character is handled correctly.
-The value returned is a Unicode codepoint if it is below #x110000 (in
-hex).  Codepoints beyond that are Emacs extensions of Unicode.  In
-particular, eight-bit characters are returned as codepoints in the
-range #x3FFF80 through #x3FFFFF, inclusive.  */)
+       doc: /* Return the first character in STRING.  */)
   (register Lisp_Object string)
 {
   register Lisp_Object val;
diff --git a/src/frame.c b/src/frame.c
index 635996ca424..19ce78dfd9c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2437,11 +2437,9 @@ use is not recommended.  Explicitly check for a frame-parameter instead.  */)
           val = values[i];
           store_frame_param (f, prop, val);
 
-          /* Changing the background color might change the background
-             mode, so that we have to load new defface specs.
-             Call frame-set-background-mode to do that.  */
-          if (EQ (prop, Qbackground_color))
-            call1 (Qframe_set_background_mode, frame);
+          if (EQ (prop, Qforeground_color)
+              || EQ (prop, Qbackground_color))
+            update_face_from_frame_parameter (f, prop, val);
         }
     }
   return Qnil;
diff --git a/src/xml.c b/src/xml.c
index 63041c96b24..a8a4d8122da 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -71,6 +71,14 @@ make_dom (xmlNode *node)
       else
         return Qnil;
     }
+  else if (node->type == XML_COMMENT_NODE)
+    {
+      if (node->content)
+        return list3 (intern ("comment"), Qnil,
+                      build_string ((char *) node->content));
+      else
+        return Qnil;
+    }
   else
     return Qnil;
 }
@@ -117,9 +125,22 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
 
   if (doc != NULL)
     {
-      node = xmlDocGetRootElement (doc);
-      if (node != NULL)
-        result = make_dom (node);
+      xmlNode *n = doc->children->next;
+      Lisp_Object r = Qnil;
+
+      while (n) {
+        if (r != Qnil)
+          result = Fcons (r, result);
+        r = make_dom (n);
+        n = n->next;
+      }
+
+      if (result == Qnil)
+        result = r;
+      else
+        result = Fcons (intern ("top"),
+                        Fcons (Qnil, Fnreverse (Fcons (r, result))));
+
       xmlFreeDoc (doc);
       xmlCleanupParser ();
     }
diff --git a/src/xwidget.c b/src/xwidget.c
index bd007aad005..b362ca55a1f 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -786,6 +786,28 @@ DEFUN("xwidget-view-info", Fxwidget_view_info , Sxwidget_view_info, 2,2,0, doc:
   return info;
 }
 
+DEFUN ("xwidget-send-keyboard-event", Fxwidget_send_keyboard_event, Sxwidget_send_keyboard_event, 2, 2, 0, doc:/* synthesize a kbd event for a xwidget. */
+       )
+  (Lisp_Object  xwidget, Lisp_Object keydescriptor)
+{
+  int keyval = 0x058; //X
+  char *keystring = "";
+
+  struct xwidget *xw = XXWIDGET(xwidget);
+
+  GdkEventKey* ev = (GdkEventKey*)gdk_event_new(GDK_KEY_PRESS);
+  ev->window = gtk_widget_get_window(xw->widget_osr);
+  ev->keyval = keyval;
+  gdk_event_put((GdkEvent*)ev);
+  ev->type = GDK_KEY_RELEASE;
+  gdk_event_put((GdkEvent*)ev);
+  gtk_main_do_event(ev);
+  gdk_event_free((GdkEvent*)ev);
+
+  return Qnil;
+}
+
+
 
 DEFUN("xwidget-delete-zombies", Fxwidget_delete_zombies , Sxwidget_delete_zombies, 0,0,0, doc: /* */)
   (void)
@@ -842,6 +864,8 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_size_request  );
   defsubr (&Sxwidget_delete_zombies);
   defsubr (&Sxwidget_disable_plugin_for_mime);
+
+  defsubr (&Sxwidget_send_keyboard_event);
   DEFSYM (Qxwidget ,"xwidget");
 
   DEFSYM (Qcxwidget ,":xwidget");