From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 14 Apr 2018 17:06:51 +0000 (+0200)
Subject: (libxml-parse-html-region): Make DISCARD-COMMENTS obsolete
X-Git-Tag: emacs-27.0.90~5220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=369cb30d8cc9b2c1eee8ed21cca89e0277f8d61d;p=emacs.git

(libxml-parse-html-region): Make DISCARD-COMMENTS obsolete

* lisp/subr.el (libxml-parse-xml-region)
(libxml-parse-html-region): Make DISCARD-COMMENTS obsolete.

* src/xml.c (Flibxml_parse_html_region)
(Flibxml_parse_xml_region): Don't mention DISCARD-COMMENTS, since
it's now no longer part of the advertised signature (bug#27178).
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 98724e9413e..9cf7d596cd9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1456,6 +1456,8 @@ be a list of the form returned by `event-start' and `event-end'."
 (set-advertised-calling-convention 'unintern '(name obarray) "23.3")
 (set-advertised-calling-convention 'indirect-function '(object) "25.1")
 (set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3")
+(set-advertised-calling-convention 'libxml-parse-xml-region '(start end base-url) "27.1")
+(set-advertised-calling-convention 'libxml-parse-html-region '(start end base-url) "27.1")
 
 ;;;; Obsolescence declarations for variables, and aliases.
 
diff --git a/src/xml.c b/src/xml.c
index fa88040597d..3674e320ef6 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -272,11 +272,8 @@ DEFUN ("libxml-parse-html-region", Flibxml_parse_html_region,
        doc: /* Parse the region as an HTML document and return the parse tree.
 If BASE-URL is non-nil, it is used to expand relative URLs.
 
-If DISCARD-COMMENTS is non-nil, the top-level HTML comment is discarded.
-
-This parameter is obsolete as of 27.1, and you should use the
-`xml-remove-comments' function to strip comments before calling
-this function if you don't want comments.  */)
+If you want comments to be stripped, use the `xml-remove-comments'
+function to strip comments before calling this function.  */)
   (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, Lisp_Object discard_comments)
 {
   if (init_libxml2_functions ())
@@ -290,11 +287,8 @@ DEFUN ("libxml-parse-xml-region", Flibxml_parse_xml_region,
        doc: /* Parse the region as an XML document and return the parse tree.
 If BASE-URL is non-nil, it is used to expand relative URLs.
 
-If DISCARD-COMMENTS is non-nil, the top-level XML comment is discarded.
-
-This parameter is obsolete as of 27.1, and you should use the
-`xml-remove-comments' function to strip comments before calling
-this function if you don't want comments.  */)
+If you want comments to be stripped, use the `xml-remove-comments'
+function to strip comments before calling this function.  */)
   (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, Lisp_Object discard_comments)
 {
   if (init_libxml2_functions ())