Mercurial > emacs
changeset 106458:3b1d7962549d
Fixed Bug#5008.
| author | Ulf Jasper <ulf.jasper@web.de> |
|---|---|
| date | Sun, 06 Dec 2009 18:13:19 +0000 |
| parents | c15d1227e860 |
| children | 44e685ee32cb |
| files | lisp/ChangeLog lisp/net/newst-backend.el lisp/xml.el |
| diffstat | 3 files changed, 38 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Dec 06 15:34:59 2009 +0000 +++ b/lisp/ChangeLog Sun Dec 06 18:13:19 2009 +0000 @@ -1,3 +1,15 @@ +2009-12-06 Ulf Jasper <ulf.jasper@web.de> + + * xml.el (xml-substitute-numeric-entities): Moved + newsticker--decode-numeric-entities in newst-backend.el to + xml-substitute-numeric-entities in xml.el. (Bug#5008) + + * net/newst-backend.el (newsticker--parse-generic-feed) + (newsticker--parse-generic-items) + (newsticker--decode-numeric-entities): Moved + newsticker--decode-numeric-entities in newst-backend.el to + xml-substitute-numeric-entities in xml.el. (Bug#5008) + 2009-12-06 Daniel Colascione <dan.colascione@gmail.com> * progmodes/js.el (js--js-not): Add null to the list of values.
--- a/lisp/net/newst-backend.el Sun Dec 06 15:34:59 2009 +0000 +++ b/lisp/net/newst-backend.el Sun Dec 06 18:13:19 2009 +0000 @@ -7,7 +7,7 @@ ;; Filename: newst-backend.el ;; URL: http://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom -;; Time-stamp: "4. Dezember 2009, 20:08:17 (ulf)" +;; Time-stamp: "5. Dezember 2009, 13:21:27 (ulf)" ;; ====================================================================== @@ -1408,9 +1408,9 @@ (position 0) (something-was-added nil)) ;; decode numeric entities - (setq title (newsticker--decode-numeric-entities title)) - (setq desc (newsticker--decode-numeric-entities desc)) - (setq link (newsticker--decode-numeric-entities link)) + (setq title (xml-substitute-numeric-entities title)) + (setq desc (xml-substitute-numeric-entities desc)) + (setq link (xml-substitute-numeric-entities link)) ;; remove whitespace from title, desc, and link (setq title (newsticker--remove-whitespace title)) (setq desc (newsticker--remove-whitespace desc)) @@ -1462,10 +1462,10 @@ (when (or (> (length title) 0) (> (length desc) 0)) ;; decode numeric entities - (setq title (newsticker--decode-numeric-entities title)) + (setq title (xml-substitute-numeric-entities title)) (when desc - (setq desc (newsticker--decode-numeric-entities desc))) - (setq link (newsticker--decode-numeric-entities link)) + (setq desc (xml-substitute-numeric-entities desc))) + (setq link (xml-substitute-numeric-entities link)) ;; remove whitespace from title, desc, and link (setq title (newsticker--remove-whitespace title)) (setq desc (newsticker--remove-whitespace desc)) @@ -1517,24 +1517,6 @@ ;; ====================================================================== ;;; Misc ;; ====================================================================== -(defun newsticker--decode-numeric-entities (string) - "Decode SGML numeric entities by their respective utf characters. -This function replaces numeric entities in the input STRING and -returns the modified string. For example \"*\" gets replaced -by \"*\"." - (if (and string (stringp string)) - (let ((start 0)) - (while (string-match "&#\\([0-9]+\\);" string start) - (condition-case nil - (setq string (replace-match - (string (read (substring string - (match-beginning 1) - (match-end 1)))) - nil nil string)) - (error nil)) - (setq start (1+ (match-beginning 0)))) - string) - nil)) (defun newsticker--remove-whitespace (string) "Remove leading and trailing whitespace from STRING."
--- a/lisp/xml.el Sun Dec 06 15:34:59 2009 +0000 +++ b/lisp/xml.el Sun Dec 06 18:13:19 2009 +0000 @@ -823,6 +823,25 @@ "") (substring string point)))))) +(defun xml-substitute-numeric-entities (string) + "Substitute SGML numeric entities by their respective utf characters. +This function replaces numeric entities in the input STRING and +returns the modified string. For example \"*\" gets replaced +by \"*\"." + (if (and string (stringp string)) + (let ((start 0)) + (while (string-match "&#\\([0-9]+\\);" string start) + (condition-case nil + (setq string (replace-match + (string (read (substring string + (match-beginning 1) + (match-end 1)))) + nil nil string)) + (error nil)) + (setq start (1+ (match-beginning 0)))) + string) + nil)) + ;;******************************************************************* ;;** ;;** Printing a tree.