[PATCH] Quote any special characters in org-make-target-link-regexp

[PATCH] Quote any special characters in org-make-target-link-regexp

[Lawrence Mitchell]

* lisp/org.el (org-make-target-link-regexp): regexp-quote target
before replacing whitespace.

Previously a radio link <<<...>>> would match all three-letter words
in the buffer.  The manual indicates the radio links are meant to
match literally (modulo whitespace differences), so we should
regexp-quote all the targets to avoid over-eager matching.
---
This problem bit me when writing up some notes on CUDA, which uses
<<<...>>> to indicate a function call from a CPU onto a GPU.  I think
this is the right fix, since I can't imagine a situation where you
would want <<<foo.bar>>> to match foo.bar, rather than foo\\.bar.

 lisp/org.el |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 6d1062c..5733d67 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5424,6 +5424,7 @@ between words."
 	"\\<\\("
 	(mapconcat
 	 (lambda (x)
+	   (setq x (regexp-quote x))
 	   (while (string-match " +" x)
 	     (setq x (replace-match "\\s-+" t t x)))
 	   x)
-- 
1.7.3.3.398.g0b0cd

[Accepted] Quote any special characters in org-make-target-link-regexp

[Carsten Dominik]

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

Maintainer comment: No comment

This relates to the following submission:

http://mid.gmane.org/%3C1292338919-22555-1-git-send-email-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] Quote any special characters in org-make-target-link-regexp
> Date: Tue, 14 Dec 2010 20:01:59 -0000
> From: Lawrence Mitchell <wence@gmx.li>
> X-Patchwork-Id: 483
> Message-Id: <1292338919-22555-1-git-send-email-wence@gmx.li>
> To: emacs-orgmode@gnu.org
> Cc: Lawrence Mitchell <wence@gmx.li>
> 
> * lisp/org.el (org-make-target-link-regexp): regexp-quote target
> before replacing whitespace.
> 
> Previously a radio link <<<...>>> would match all three-letter words
> in the buffer.  The manual indicates the radio links are meant to
> match literally (modulo whitespace differences), so we should
> regexp-quote all the targets to avoid over-eager matching.
> 
> ---
> This problem bit me when writing up some notes on CUDA, which uses
> <<<...>>> to indicate a function call from a CPU onto a GPU.  I think
> this is the right fix, since I can't imagine a situation where you
> would want <<<foo.bar>>> to match foo.bar, rather than foo\\.bar.
> 
>  lisp/org.el |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/lisp/org.el b/lisp/org.el
> index 6d1062c..5733d67 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -5424,6 +5424,7 @@ between words."
>  	"\\<\\("
>  	(mapconcat
>  	 (lambda (x)
> +	   (setq x (regexp-quote x))
>  	   (while (string-match " +" x)
>  	     (setq x (replace-match "\\s-+" t t x)))
>  	   x)
> 

Re: [PATCH] Quote any special characters in org-make-target-link-regexp

[Carsten Dominik]

Lawrence,

thanks for the patch, with flawless ChangeLog and commit message!

Patch accepted.

- Carsten


On Dec 14, 2010, at 4:01 PM, Lawrence Mitchell wrote:

> * lisp/org.el (org-make-target-link-regexp): regexp-quote target
> before replacing whitespace.
>
> Previously a radio link <<<...>>> would match all three-letter words
> in the buffer.  The manual indicates the radio links are meant to
> match literally (modulo whitespace differences), so we should
> regexp-quote all the targets to avoid over-eager matching.
> ---
> This problem bit me when writing up some notes on CUDA, which uses
> <<<...>>> to indicate a function call from a CPU onto a GPU.  I think
> this is the right fix, since I can't imagine a situation where you
> would want <<<foo.bar>>> to match foo.bar, rather than foo\\.bar.
>
> lisp/org.el |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/lisp/org.el b/lisp/org.el
> index 6d1062c..5733d67 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -5424,6 +5424,7 @@ between words."
> 	"\\<\\("
> 	(mapconcat
> 	 (lambda (x)
> +	   (setq x (regexp-quote x))
> 	   (while (string-match " +" x)
> 	     (setq x (replace-match "\\s-+" t t x)))
> 	   x)
> -- 
> 1.7.3.3.398.g0b0cd
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode