From ed8a9616a2c86fda8f6a20da88d8ac58d88c9f58 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 11 Mar 2011 18:37:22 +0100 Subject: [PATCH] Revert "* org-html.el: Bugfix: prevent infinite matching of the `&' character." This reverts commit f6752c805ead638d81bb2718aa32c19924eb1e73. --- lisp/org-html.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 1f3394e35..c60c90d1b 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -2184,9 +2184,7 @@ Possible conversions are set in `org-export-html-protect-char-alist'." (let ((cl org-export-html-protect-char-alist) c) (while (setq c (pop cl)) (let ((start 0)) - (while (and (string-match (car c) s start) - ;; prevent infinite matching of & - (not (string-match "&" s start))) + (while (string-match (car c) s start) (setq s (replace-match (cdr c) t t s) start (match-beginning 0))))) s)) -- 2.11.4.GIT