diff options
| author | Lars Magne Ingebrigtsen | 2011-07-20 22:45:13 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-20 22:45:13 +0200 |
| commit | 9abd05321943d7c962c79bfd4ef3354d93ead53e (patch) | |
| tree | 7f7a6092890d19c969ae710d95a087e0cea1829c /src | |
| parent | 36881d164d73f53a1cbb390de8509506b14a2c89 (diff) | |
| download | emacs-9abd05321943d7c962c79bfd4ef3354d93ead53e.tar.gz emacs-9abd05321943d7c962c79bfd4ef3354d93ead53e.zip | |
* xml.c (parse_region): Make sure we always return a tree.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xml.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 02819607fd9..1f0ebae2645 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-07-20 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * xml.c (parse_region): Make sure we always return a tree. | ||
| 4 | |||
| 1 | 2011-07-20 HAMANO Kiyoto <khiker.mail@gmail.com> | 5 | 2011-07-20 HAMANO Kiyoto <khiker.mail@gmail.com> |
| 2 | 6 | ||
| 3 | * xml.c (parse_region): If a document contains only comments, | 7 | * xml.c (parse_region): If a document contains only comments, |
| @@ -138,7 +138,8 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html | |||
| 138 | if (result == Qnil) | 138 | if (result == Qnil) |
| 139 | result = r; | 139 | result = r; |
| 140 | else | 140 | else |
| 141 | result = Fnreverse (Fcons (r, result)); | 141 | result = Fcons (intern ("top"), |
| 142 | Fcons (Qnil, Fnreverse (Fcons (r, result)))); | ||
| 142 | 143 | ||
| 143 | xmlFreeDoc (doc); | 144 | xmlFreeDoc (doc); |
| 144 | xmlCleanupParser (); | 145 | xmlCleanupParser (); |