aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Jasper2014-11-22 15:51:12 +0100
committerUlf Jasper2014-11-22 15:51:12 +0100
commit46035c64e6f3036c37ef2bd1636afc41a8d0e809 (patch)
tree6fd7a25f0f24477c328a4df15eb8f52b1907985d
parentb559a60382a3e192250e533c4a9daecacabd4026 (diff)
downloademacs-46035c64e6f3036c37ef2bd1636afc41a8d0e809.tar.gz
emacs-46035c64e6f3036c37ef2bd1636afc41a8d0e809.zip
newsticker: Fix bug#18787: Tell libxml-parse-xml-region to discard comments.
* lisp/net/newst-backend.el (newsticker--sentinel-work): Tell `libxml-parse-xml-region' to discard comments. Fixes bug#18787.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/newst-backend.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3a9b64a478..4c7b58341dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-22 Ulf Jasper <ulf.jasper@web.de>
2
3 * net/newst-backend.el (newsticker--sentinel-work): Tell
4 `libxml-parse-xml-region' to discard comments. Fixes bug#18787.
5
12014-11-22 Michael Albinus <michael.albinus@gmx.de> 62014-11-22 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-sh.el (tramp-sh-handle-start-file-process) 8 * net/tramp-sh.el (tramp-sh-handle-start-file-process)
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index ba100534085..7be07c74fcb 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -879,10 +879,11 @@ Argument BUFFER is the buffer of the retrieval process."
879 (decode-coding-region (point-min) (point-max) 879 (decode-coding-region (point-min) (point-max)
880 coding-system)) 880 coding-system))
881 (condition-case errordata 881 (condition-case errordata
882 ;; The xml parser might fail 882 ;; The xml parser might fail or the xml might be
883 ;; or the xml might be bugged 883 ;; bugged
884 (if (fboundp 'libxml-parse-xml-region) 884 (if (fboundp 'libxml-parse-xml-region)
885 (list (libxml-parse-xml-region (point-min) (point-max))) 885 (list (libxml-parse-xml-region (point-min) (point-max)
886 nil t))
886 (xml-parse-region (point-min) (point-max))) 887 (xml-parse-region (point-min) (point-max)))
887 (error (message "Could not parse %s: %s" 888 (error (message "Could not parse %s: %s"
888 (buffer-name) (cadr errordata)) 889 (buffer-name) (cadr errordata))