6 files changed, 75 insertions, 15 deletions

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");