diff options
| author | Robert Pluim | 2017-11-03 11:33:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2017-11-03 11:33:06 +0200 |
| commit | 620247ac205b80ceb142ee70500ab2c3ffa46fe2 (patch) | |
| tree | deb29eb58c456575d69b51f92decb8faab550c45 /doc/lispref | |
| parent | 92b2cedec60f47faa896963b51bfd370eb3e71cb (diff) | |
| download | emacs-620247ac205b80ceb142ee70500ab2c3ffa46fe2.tar.gz emacs-620247ac205b80ceb142ee70500ab2c3ffa46fe2.zip | |
New function 'libxml-available-p'
* src/emacs.c (main): Call syms_of_xml unconditionally.
* src/lisp.h: Provide syms_of_xml prototype even when
HAVE_LIBXML2 is not defined.
* src/xml.c (Flibxml_available_p): New function, cloned from
Fgnutls_available_p.
(syms_of_xml): Provide Slibxml_available_p.
* doc/lispref/text.texi (Parsing HTML/XML): Document libxml-available-p.
(GnuTLS Cryptography, Format of GnuTLS Cryptography Inputs)
(Document Object Model): Fix indentation of the first paragraph.
* etc/NEWS (libxml-available-p): Mention libxml-available-p.
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/text.texi | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index baa3c708e90..6094a41c473 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -4536,9 +4536,9 @@ It should be somewhat more efficient on larger buffers than | |||
| 4536 | @cindex symmetric cipher | 4536 | @cindex symmetric cipher |
| 4537 | @cindex cipher, symmetric | 4537 | @cindex cipher, symmetric |
| 4538 | 4538 | ||
| 4539 | If compiled with GnuTLS, Emacs offers built-in cryptographic support. | 4539 | If compiled with GnuTLS, Emacs offers built-in cryptographic |
| 4540 | Following the GnuTLS API terminology, the available tools are digests, | 4540 | support. Following the GnuTLS API terminology, the available tools |
| 4541 | MACs, symmetric ciphers, and AEAD ciphers. | 4541 | are digests, MACs, symmetric ciphers, and AEAD ciphers. |
| 4542 | 4542 | ||
| 4543 | The terms used herein, such as IV (Initialization Vector), require | 4543 | The terms used herein, such as IV (Initialization Vector), require |
| 4544 | some familiarity with cryptography and will not be defined in detail. | 4544 | some familiarity with cryptography and will not be defined in detail. |
| @@ -4556,7 +4556,7 @@ structure of the GnuTLS library. | |||
| 4556 | @cindex format of gnutls cryptography inputs | 4556 | @cindex format of gnutls cryptography inputs |
| 4557 | @cindex gnutls cryptography inputs format | 4557 | @cindex gnutls cryptography inputs format |
| 4558 | 4558 | ||
| 4559 | The inputs to GnuTLS cryptographic functions can be specified in | 4559 | The inputs to GnuTLS cryptographic functions can be specified in |
| 4560 | several ways, both as primitive Emacs Lisp types or as lists. | 4560 | several ways, both as primitive Emacs Lisp types or as lists. |
| 4561 | 4561 | ||
| 4562 | The list form is currently similar to how @code{md5} and | 4562 | The list form is currently similar to how @code{md5} and |
| @@ -4723,8 +4723,15 @@ IV used. | |||
| 4723 | @section Parsing HTML and XML | 4723 | @section Parsing HTML and XML |
| 4724 | @cindex parsing html | 4724 | @cindex parsing html |
| 4725 | 4725 | ||
| 4726 | When Emacs is compiled with libxml2 support, the following functions | 4726 | Emacs can be compiled with built-in libxml2 support. |
| 4727 | are available to parse HTML or XML text into Lisp object trees. | 4727 | |
| 4728 | @defun libxml-available-p | ||
| 4729 | This function returns non-@code{nil} if built-in libxml2 support is | ||
| 4730 | available in this Emacs session. | ||
| 4731 | @end defun | ||
| 4732 | |||
| 4733 | When libxml2 support is available, the following functions can be used | ||
| 4734 | to parse HTML or XML text into Lisp object trees. | ||
| 4728 | 4735 | ||
| 4729 | @defun libxml-parse-html-region start end &optional base-url discard-comments | 4736 | @defun libxml-parse-html-region start end &optional base-url discard-comments |
| 4730 | This function parses the text between @var{start} and @var{end} as | 4737 | This function parses the text between @var{start} and @var{end} as |
| @@ -4791,9 +4798,9 @@ about syntax). | |||
| 4791 | @cindex DOM | 4798 | @cindex DOM |
| 4792 | @cindex Document Object Model | 4799 | @cindex Document Object Model |
| 4793 | 4800 | ||
| 4794 | The @acronym{DOM} returned by @code{libxml-parse-html-region} (and the | 4801 | The @acronym{DOM} returned by @code{libxml-parse-html-region} (and |
| 4795 | other @acronym{XML} parsing functions) is a tree structure where each | 4802 | the other @acronym{XML} parsing functions) is a tree structure where |
| 4796 | node has a node name (called a @dfn{tag}), and optional key/value | 4803 | each node has a node name (called a @dfn{tag}), and optional key/value |
| 4797 | @dfn{attribute} list, and then a list of @dfn{child nodes}. The child | 4804 | @dfn{attribute} list, and then a list of @dfn{child nodes}. The child |
| 4798 | nodes are either strings or @acronym{DOM} objects. | 4805 | nodes are either strings or @acronym{DOM} objects. |
| 4799 | 4806 | ||