emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Albert Krewinkel <tarleb@moltkeplatz.de>
To: Bastien <bzg@gnu.org>
Cc: Albert Krewinkel <tarleb@moltkeplatz.de>, emacs-orgmode@gnu.org
Subject: [PATCH] org.el (org-offer-links-in-entry): Reuse global variable
Date: Sun, 11 May 2014 18:33:29 +0200	[thread overview]
Message-ID: <1399826009-369-2-git-send-email-tarleb@moltkeplatz.de> (raw)
In-Reply-To: <1399826009-369-1-git-send-email-tarleb@moltkeplatz.de>
In-Reply-To: <87k39zmcw2.fsf@bzg.ath.cx>

* org.el (org-offer-links-in-entry): Use global variable
  `org-any-link-re' instead of defining a string-equal local variable.

The `re' variable defined in function `org-offer-links-in-entry' is
string-equal to `org-any-link-re' and is hence replaced by the latter.

 lisp/org.el | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index c16fab0..40d6972 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10709,10 +10709,7 @@ there is one, return it."
 	(goto-char marker)
-	(let ((re (concat "\\(" org-bracket-link-regexp "\\)\\|"
-			  "\\(" org-angle-link-re "\\)\\|"
-			  "\\(" org-plain-link-re "\\)"))
-	      (cnt ?0)
+	(let ((cnt ?0)
 	      (in-emacs (if (integerp nth) nil nth))
 	      have-zero end links link c)
 	  (when (and (stringp zero) (string-match org-bracket-link-regexp zero))
@@ -10721,7 +10718,7 @@ there is one, return it."
 	    (org-back-to-heading t)
 	    (setq end (save-excursion (outline-next-heading) (point)))
-	    (while (re-search-forward re end t)
+	    (while (re-search-forward org-any-link-re end t)
 	      (push (match-string 0) links))
 	    (setq links (org-uniquify (reverse links))))

  reply	other threads:[~2014-05-11 16:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-24 14:36 [PATCH] org.el (org-offer-links-in-entry): Remove code duplication Albert Krewinkel
2014-05-06  9:29 ` Bastien
2014-05-11 16:33   ` Albert Krewinkel
2014-05-11 16:33     ` Albert Krewinkel [this message]
2014-05-20 21:08       ` [PATCH] org.el (org-offer-links-in-entry): Reuse global variable Bastien
2014-05-11 19:09     ` [PATCH] org.el (org-offer-links-in-entry): Remove code duplication Achim Gratz
2014-05-15 10:41       ` Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399826009-369-2-git-send-email-tarleb@moltkeplatz.de \
    --to=tarleb@moltkeplatz.de \
    --cc=bzg@gnu.org \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).