From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Loury Subject: [PATCH] Fix bad substitution of org-make-link Date: Fri, 04 Jan 2013 13:55:49 +0100 Message-ID: <87txqxrtt6.fsf@konixwork.incubateur.ens-lyon.fr> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:58025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tr6pw-0000uT-Ve for emacs-orgmode@gnu.org; Fri, 04 Jan 2013 07:57:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tr6pv-0006cV-ST for emacs-orgmode@gnu.org; Fri, 04 Jan 2013 07:57:24 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tr6pv-0006cQ-Lo for emacs-orgmode@gnu.org; Fri, 04 Jan 2013 07:57:23 -0500 Received: by mail-wi0-f178.google.com with SMTP id hn3so9218712wib.5 for ; Fri, 04 Jan 2013 04:57:22 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: OrgMode ML --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable In the commit 502e538020d02522dd40b4b5f940cf43d19096ab, some org-make-link have been replaced by contact instead of concat, this patch corrects that small mistake. =2D-=20 Konubinix GPG Key : 7439106A Fingerprint: 5993 BE7A DA65 E2D9 06CE 5C36 75D2 3CED 7439 106A --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-an-error-introduced-in-502e538020d02522dd40b4b5f.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch From=20acc73f37e6f1506e53e20c4a417a2a1116841849 Mon Sep 17 00:00:00 2001 From: Samuel Loury 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 =2D-- 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 =2D-- 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 =2D (org-store-link-props :link (contact "bookmark:" bookmark) + (org-store-link-props :link (concat "bookmark:" bookmark) :description bookmark)))) =20 (provide 'org-bookmark) diff --git a/contrib/lisp/org-git-link.el b/contrib/lisp/org-git-link.el index e18e2af..2f5990f 100644 =2D-- 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)))) =2D (contact "git:" file "::" (org-git-create-searchstring branchname ti= mestring)))) + (concat "git:" file "::" (org-git-create-searchstring branchname times= tring)))) =20 (defun org-git-store-link () "Store git link to current file." =2D-=20 1.7.10.4 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAEBAgAGBQJQ5tFWAAoJEHXSPO10ORBqIqsIALjDwdfiQVxSWCpagqQpJs+i 8rMfMy8P6yFR/zZRIJNJRPmwCu+9kL/Hly3UwEj20nJlc08w/faVpFjgedZHtBKf mXDel5Ns23so0nYJf+3/NojAvKb9bDjUZbns9bCrRTGxa8fqet1dPSFshJDIsbbD wiELvMIgPqMzrohQVUuRIQPyI7JYsINCb54XJArwJUySYOYe+LKe2PELte7OnBz6 FVAS7FlZse+Y8vu+iPxRJCSDGB73JwBSvbhNsDxk7CjNatqKEN3KmlpjAsPffeIl EhCFWvFw91IwTPkr6fz3NVhsPCwrUsH5RWBywgo1whQJBctzIUdWLJq97RemXBo= =zhgt -----END PGP SIGNATURE----- --==-=-=--