[Emacs-diffs] master 369cb30: (libxml-parse-html-region): Make DISCARD-COMMENTS obsolete

[Lars Ingebrigtsen]

branch: master
commit 369cb30d8cc9b2c1eee8ed21cca89e0277f8d61d
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    (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).
---
 lisp/subr.el |  2 ++
 src/xml.c    | 14 ++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index 98724e9..9cf7d59 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 fa88040..3674e32 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 ())