Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2010-07-02 07:05:08 +02:00
commit 37faacc629

View file

@ -271,8 +271,7 @@ have been saved."
(defun org-feed-unescape (s) (defun org-feed-unescape (s)
"Unescape protected entities in S." "Unescape protected entities in S."
(let ((re (concat "&\\(" (let ((re (concat "&\\("
(mapconcat (lambda (e) (mapconcat 'car xml-entity-alist "\\|")
(car e)) xml-entity-alist "\\|")
"\\);"))) "\\);")))
(while (string-match re s) (while (string-match re s)
(setq s (replace-match (setq s (replace-match