Mercurial > emacs
view src/xml.c @ 110465:b7b7e970d807
Merge changes made in Gnus trunk.
gnus-group.el (gnus-group-line-format-alist): Have the ?U (unseen) spec inserr "*" if the group isn't active instead of 0.
nnimap.el (nnimap-request-create-group): Implement.
nnimap.el: Use the IMAP version of utf7-encode throughout.
nnimap.el: Implement the nnimap article expunging interface method, and make it more general.
gnus-group.el: Put back the nnimap autoloads needed to do the acl stuff.
gnus-sum.el (gnus-summary-move-article): When respooling to the same method, this would bug out.
nnimap.el (nnimap-request-group): When we have zero articles, return the right data to Gnus.
nnimap.el (nnimap-request-expire-articles): Only delete articles immediately if the target is 'delete.
nnmail.el (nnmail-expired-article-p): Allow returning the cutoff time for oldness in addition to being a predicate.
nnimap.el: Implement nnimap expiry.
nnimap.el (nnimap-request-move-article): Request the article before looking at what the Message-ID is.
nnimap.el (nnimap-mark-and-expunge-incoming): Wait for the last sequence.
gnus-sum.el (gnus-summary-move-article): Use gnus-server-equal to find out whether methods are equal.
nnimap.el (nnimap-find-expired-articles): Don't refer to nnml-inhibit-expiry.
nnmail.el (nnmail-expired-article-p): Fix typo: time-subtract.
gnus-start.el (gnus-get-unread-articles): Fix the prefixed select method in the presence of many similar methods.
When we have several similar methods, try to create as few extended methods as possible.
gnus-sum.el (gnus-adjust-marked-articles): Hack to avoid adjusting marks for nnimap, which is seldom the right thing to do.
gnus-int.el (gnus-open-server): Give a better error message in the "go offline" case.
gnus-sum.el (gnus-adjust-marked-articles): Fix another typo.
nnml.el (nnml-generate-nov-file): Fix variable name clobbering from previous patch.
gnus-start.el (gnus-get-unread-articles): Get the extended method slightly later to avoid double-getting it.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 21 Sep 2010 23:13:46 +0000 |
parents | a828354ee483 |
children | 52590453d4f9 |
line wrap: on
line source
/* Interface to libxml2. Copyright (C) 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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> #ifdef HAVE_LIBXML2 #include <setjmp.h> #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/HTMLparser.h> #include "lisp.h" #include "buffer.h" Lisp_Object make_dom (xmlNode *node) { if (node->type == XML_ELEMENT_NODE) { Lisp_Object result = Fcons (intern (node->name), Qnil); xmlNode *child; xmlAttr *property; /* First add the attributes. */ property = node->properties; while (property != NULL) { if (property->children && property->children->content) { char *pname = xmalloc (strlen (property->name) + 2); *pname = ':'; strcpy(pname + 1, property->name); result = Fcons (Fcons (intern (pname), build_string(property->children->content)), result); xfree (pname); } property = property->next; } /* Then add the children of the node. */ child = node->children; while (child != NULL) { result = Fcons (make_dom (child), result); child = child->next; } return Fnreverse (result); } else if (node->type == XML_TEXT_NODE) { Lisp_Object content = Qnil; if (node->content) content = build_string (node->content); return Fcons (intern (node->name), content); } else return Qnil; } static Lisp_Object parse_string (Lisp_Object string, Lisp_Object base_url, int htmlp) { xmlDoc *doc; xmlNode *node; Lisp_Object result = Qnil; int ibeg, iend; char *burl = ""; LIBXML_TEST_VERSION; CHECK_STRING (string); if (! NILP (base_url)) { CHECK_STRING (base_url); burl = SDATA (base_url); } if (htmlp) doc = htmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8", HTML_PARSE_RECOVER|HTML_PARSE_NONET| HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR); else doc = xmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8", XML_PARSE_NONET|XML_PARSE_NOWARNING| XML_PARSE_NOERROR); if (doc != NULL) { node = xmlDocGetRootElement (doc); if (node != NULL) result = make_dom (node); xmlFreeDoc (doc); xmlCleanupParser (); } return result; } DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string, 1, 2, 0, doc: /* Parse STRING as an HTML document and return the parse tree. If BASE-URL is non-nil, it will be used to expand relative URLs in the HTML document. */) (Lisp_Object string, Lisp_Object base_url) { return parse_string (string, base_url, 1); } DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string, 1, 2, 0, doc: /* Parse STRING as an XML document and return the parse tree. If BASE-URL is non-nil, it will be used to expand relative URLs in the XML document. */) (Lisp_Object string, Lisp_Object base_url) { return parse_string (string, base_url, 0); } /*********************************************************************** Initialization ***********************************************************************/ void syms_of_xml (void) { defsubr (&Shtml_parse_string); defsubr (&Sxml_parse_string); } #endif /* HAVE_LIBXML2 */