From 1e98674d93976b78c3459c58cadece9565c53da2 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 20 Jul 2011 21:58:46 +0200 Subject: * xml.c (make_dom): Return comments, too. --- src/ChangeLog | 4 ++++ src/xml.c | 8 ++++++++ 2 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index e098e536efb..86062435a5d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-07-20 Lars Magne Ingebrigtsen + + * xml.c (make_dom): Return comments, too. + 2011-07-19 Paul Eggert Port to OpenBSD. diff --git a/src/xml.c b/src/xml.c index 63041c96b24..6dd52638b7d 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; } -- cgit v1.2.1 From 36881d164d73f53a1cbb390de8509506b14a2c89 Mon Sep 17 00:00:00 2001 From: HAMANO Kiyoto Date: Wed, 20 Jul 2011 22:05:02 +0200 Subject: * xml.c (parse_region): If a document contains only comments, return that, too. --- src/ChangeLog | 5 +++++ src/xml.c | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 86062435a5d..02819607fd9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-20 HAMANO Kiyoto + + * xml.c (parse_region): If a document contains only comments, + return that, too. + 2011-07-20 Lars Magne Ingebrigtsen * xml.c (make_dom): Return comments, too. diff --git a/src/xml.c b/src/xml.c index 6dd52638b7d..6d212b44059 100644 --- a/src/xml.c +++ b/src/xml.c @@ -125,9 +125,21 @@ 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 = Fnreverse (Fcons (r, result)); + xmlFreeDoc (doc); xmlCleanupParser (); } -- cgit v1.2.1 From 9abd05321943d7c962c79bfd4ef3354d93ead53e Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 20 Jul 2011 22:45:13 +0200 Subject: * xml.c (parse_region): Make sure we always return a tree. --- src/ChangeLog | 4 ++++ src/xml.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 02819607fd9..1f0ebae2645 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-07-20 Lars Magne Ingebrigtsen + + * xml.c (parse_region): Make sure we always return a tree. + 2011-07-20 HAMANO Kiyoto * xml.c (parse_region): If a document contains only comments, diff --git a/src/xml.c b/src/xml.c index 6d212b44059..a8a4d8122da 100644 --- a/src/xml.c +++ b/src/xml.c @@ -138,7 +138,8 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html if (result == Qnil) result = r; else - result = Fnreverse (Fcons (r, result)); + result = Fcons (intern ("top"), + Fcons (Qnil, Fnreverse (Fcons (r, result)))); xmlFreeDoc (doc); xmlCleanupParser (); -- cgit v1.2.1 From da4adb048de353aebca7ec75548a7f94554f5073 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 21 Jul 2011 14:38:21 -0400 Subject: Doc fix for string-to-char (Bug#6576). * editfns.c (Fstring_to_char): No need to explain what a character is in the docstring. --- src/ChangeLog | 5 +++++ src/editfns.c | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 1f0ebae2645..23ece8dfed5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-21 Chong Yidong + + * editfns.c (Fstring_to_char): No need to explain what a character + is in the docstring (Bug#6576). + 2011-07-20 Lars Magne Ingebrigtsen * xml.c (parse_region): Make sure we always return a tree. 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; -- cgit v1.2.1 From 043604ee51e5b5e0d0f645b999a35a1609a16b24 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 22 Jul 2011 01:02:24 -0400 Subject: Fix --reverse-video on ttys. * src/frame.c (Fmodify_frame_parameters): In tty case, update the default face if necessary. Fixes: debbugs:4238 --- src/ChangeLog | 5 +++++ src/frame.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 23ece8dfed5..65cd07df0ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-22 Chong Yidong + + * frame.c (Fmodify_frame_parameters): In tty case, update the + default face if necessary (Bug#4238). + 2011-07-21 Chong Yidong * editfns.c (Fstring_to_char): No need to explain what a character 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; -- cgit v1.2.1