From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien Guerry <bzg@altern.org>
Subject: [Accepted] [Orgmode, 1/2] Only match complete words in
 org-export-add-options-to-plist
Date: Sun, 13 Feb 2011 00:49:00 +0100 (CET)
Message-ID: <20110212234900.7FCAF8860@myhost.localdomain>
References: <1c07dac7fa0dd036dec6a1147fde83c5cddf8639.1295529378.git.wence@gmx.li>
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=45622 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PoPD0-0001U2-Dh
	for emacs-orgmode@gnu.org; Sat, 12 Feb 2011 18:48:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1PoPCz-0002XT-85
	for emacs-orgmode@gnu.org; Sat, 12 Feb 2011 18:48:58 -0500
Received: from mail-fx0-f41.google.com ([209.85.161.41]:53670)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1PoPCy-0002XK-QG
	for emacs-orgmode@gnu.org; Sat, 12 Feb 2011 18:48:57 -0500
Received: by fxm12 with SMTP id 12so4191728fxm.0
	for <emacs-orgmode@gnu.org>; Sat, 12 Feb 2011 15:48:55 -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 551 (http://patchwork.newartisans.com/patch/551/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C1c07dac7fa0dd036dec6a1147fde83c5cddf8639.1295529378.git.wence%40gmx.li%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: [Orgmode,
> 	1/2] Only match complete words in org-export-add-options-to-plist
> Date: Thu, 20 Jan 2011 18:23:22 -0000
> From: Lawrence Mitchell <wence@gmx.li>
> X-Patchwork-Id: 551
> Message-Id: <1c07dac7fa0dd036dec6a1147fde83c5cddf8639.1295529378.git.wence@gmx.li>
> To: emacs-orgmode@gnu.org
> Cc: Lawrence Mitchell <wence@gmx.li>
> 
> * org-exp.el (org-export-add-options-to-plist): Require match to start
> at a word-boundary.
> 
> Previously, if an option was the suffix of another option (such as TeX
> and LaTeX) the setting for the former would propagator to the latter.
> This seems like an unintended consequence of a lax regexp in
> org-export-add-options-to-plist.  This patch allows options to share a
> suffix with another option by requiring that the match against an
> option starts at a word-boundary.
> 
> ---
> lisp/org-exp.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-exp.el b/lisp/org-exp.el
> index 9954227..d099c82 100644
> --- a/lisp/org-exp.el
> +++ b/lisp/org-exp.el
> @@ -824,7 +824,7 @@ security risks."
>        (let ((op org-export-plist-vars))
>  	(while (setq o (pop op))
>  	  (if (and (nth 1 o)
> -		   (string-match (concat (regexp-quote (nth 1 o))
> +		   (string-match (concat "\\<" (regexp-quote (nth 1 o))
>  					 ":\\([^ \t\n\r;,.]*\\)")
>  				 options))
>  	      (setq p (plist-put p (car o)
>