From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien Guerry <bzg@altern.org>
Subject: [Accepted] [O] Fix for infinite loop in org-html-protect
Date: Fri, 11 Mar 2011 18:38:24 +0100 (CET)
Message-ID: <20110311173824.A1BBD6A2C@myhost.localdomain>
References: <19834.23619.813886.886825@gargle.gargle.HOWL>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=47307 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Py6Id-0008J3-08
	for emacs-orgmode@gnu.org; Fri, 11 Mar 2011 12:38:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Py6Ib-0005Zh-Co
	for emacs-orgmode@gnu.org; Fri, 11 Mar 2011 12:38:50 -0500
Received: from mail-ww0-f49.google.com ([74.125.82.49]:63092)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Py6Ib-0005ZP-7h
	for emacs-orgmode@gnu.org; Fri, 11 Mar 2011 12:38:49 -0500
Received: by wwc33 with SMTP id 33so2909648wwc.30
	for <emacs-orgmode@gnu.org>; Fri, 11 Mar 2011 09:38:48 -0800 (PST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Patch 674 (http://patchwork.newartisans.com/patch/674/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C19834.23619.813886.886825%40gargle.gargle.HOWL%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [O] Fix for infinite loop in org-html-protect
> Date: Fri, 11 Mar 2011 22:30:43 -0000
> From: Kim Rutherford <kmr44@cam.ac.uk>
> X-Patchwork-Id: 674
> Message-Id: <19834.23619.813886.886825@gargle.gargle.HOWL>
> To: emacs-orgmode@gnu.org
> 
> When I export the following as HTML, emacs hangs in org-html-protect:
> 
> #+begin_src org
> &
> #+end_src
> 
> The attached patch fixes the problem for me.
> 
> Thanks,
> Kim.
> >From cfb1ccb6f9cfd84530c73b7f72d686a2062b3c3b Mon Sep 17 00:00:00 2001
> From: Kim Rutherford <kmr44@cam.ac.uk>
> Date: Fri, 11 Mar 2011 16:44:09 +0000
> Subject: [PATCH] Fix infinite loop in org-html-protect
> 
> ---
> lisp/org-html.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-html.el b/lisp/org-html.el
> index c60c90d..2312b21 100644
> --- a/lisp/org-html.el
> +++ b/lisp/org-html.el
> @@ -2186,7 +2186,7 @@ Possible conversions are set in `org-export-html-protect-char-alist'."
>        (let ((start 0))
>  	(while (string-match (car c) s start)
>  	  (setq s (replace-match (cdr c) t t s)
> -		start (match-beginning 0)))))
> +		start (1+ (match-beginning 0))))))
>      s))
>  
>  (defun org-html-expand (string)
>