From: Samuel Loury <konubinix@gmail.com>
To: OrgMode ML <emacs-orgmode@gnu.org>
Subject: [PATCH] Fix bad substitution of org-make-link
Date: Fri, 04 Jan 2013 13:55:49 +0100 [thread overview]
Message-ID: <87txqxrtt6.fsf@konixwork.incubateur.ens-lyon.fr> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 271 bytes --]
In the commit 502e538020d02522dd40b4b5f940cf43d19096ab, some
org-make-link have been replaced by contact instead of concat, this
patch corrects that small mistake.
--
Konubinix
GPG Key : 7439106A
Fingerprint: 5993 BE7A DA65 E2D9 06CE 5C36 75D2 3CED 7439 106A
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: patch --]
[-- Type: text/x-diff, Size: 1852 bytes --]
From acc73f37e6f1506e53e20c4a417a2a1116841849 Mon Sep 17 00:00:00 2001
From: Samuel Loury <konubinixweb@gmail.com>
Date: Fri, 4 Jan 2013 13:47:59 +0100
Subject: [PATCH] Fix an error introduced in
502e538020d02522dd40b4b5f940cf43d19096ab, org-make-link was
replaced by contact instead of concat as the comment
suggested
* org-git-link.el (org-git-create-git-link): Replace contact call by concat
* org-bookmark.el (org-bookmark-store-link): Replace contact call by concat
TINYCHANGE
---
contrib/lisp/org-bookmark.el | 2 +-
contrib/lisp/org-git-link.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/lisp/org-bookmark.el b/contrib/lisp/org-bookmark.el
index 78a6f57..5c669b0 100644
--- a/contrib/lisp/org-bookmark.el
+++ b/contrib/lisp/org-bookmark.el
@@ -80,7 +80,7 @@ Otherwise prompt the user for the right bookmark to use."
(car bmks)
(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))
(if bookmark
- (org-store-link-props :link (contact "bookmark:" bookmark)
+ (org-store-link-props :link (concat "bookmark:" bookmark)
:description bookmark))))
(provide 'org-bookmark)
diff --git a/contrib/lisp/org-git-link.el b/contrib/lisp/org-git-link.el
index e18e2af..2f5990f 100644
--- a/contrib/lisp/org-git-link.el
+++ b/contrib/lisp/org-git-link.el
@@ -171,7 +171,7 @@
(let* ((gitdir (first (org-git-find-gitdir (file-truename file))))
(branchname (org-git-get-current-branch gitdir))
(timestring (format-time-string "%Y-%m-%d" (current-time))))
- (contact "git:" file "::" (org-git-create-searchstring branchname timestring))))
+ (concat "git:" file "::" (org-git-create-searchstring branchname timestring))))
(defun org-git-store-link ()
"Store git link to current file."
--
1.7.10.4
[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]
next reply other threads:[~2013-01-04 12:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-04 12:55 Samuel Loury [this message]
2013-01-04 15:40 ` [PATCH] Fix bad substitution of org-make-link 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
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=87txqxrtt6.fsf@konixwork.incubateur.ens-lyon.fr \
--to=konubinix@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).