summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-20 14:03:15 +0200
committerBastien Guerry <bzg@altern.org>2012-08-20 14:03:15 +0200
commit502e538020d02522dd40b4b5f940cf43d19096ab (patch)
treefb4a6b84dd38a0587b150a04075b6a61c3758c46
parentd6db2566d90c237d62006ac988eebce759b9afc1 (diff)
downloadorg-mode-502e538020d02522dd40b4b5f940cf43d19096ab.tar.gz
contrib/lisp/: Replace the deleted function `org-make-link' by `concat'
* org-notmuch.el (org-notmuch-store-link) (org-notmuch-search-store-link): Use `concat' instead of `org-make-link'. * org-git-link.el (org-git-create-git-link) (org-git-insert-link-interactively): Ditto. * org-bookmark.el (org-bookmark-store-link): Ditto. Thanks to Friedrich Delgado for reporting this.
-rw-r--r--contrib/lisp/org-bookmark.el2
-rw-r--r--contrib/lisp/org-git-link.el4
-rw-r--r--contrib/lisp/org-notmuch.el6
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/lisp/org-bookmark.el b/contrib/lisp/org-bookmark.el
index 586597a..56129d2 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 (org-make-link "bookmark:" bookmark)
+ (org-store-link-props :link (contact "bookmark:" bookmark)
:description bookmark))))
(provide 'org-bookmark)
diff --git a/contrib/lisp/org-git-link.el b/contrib/lisp/org-git-link.el
index 538fe43..8223712 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))))
- (org-make-link "git:" file "::" (org-git-create-searchstring branchname timestring))))
+ (contact "git:" file "::" (org-git-create-searchstring branchname timestring))))
(defun org-git-store-link ()
"Store git link to current file."
@@ -186,7 +186,7 @@
(defun org-git-insert-link-interactively (file searchstring &optional description)
(interactive "FFile: \nsSearch string: \nsDescription: ")
- (insert (org-make-link-string (org-make-link "git:" file "::" searchstring) description)))
+ (insert (org-make-link-string (concat "git:" file "::" searchstring) description)))
;; Calling git
(defun org-git-show (gitdir object buffer)
diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el
index 25f6ab6..0affd71 100644
--- a/contrib/lisp/org-notmuch.el
+++ b/contrib/lisp/org-notmuch.el
@@ -58,7 +58,7 @@
(org-store-link-props :type "notmuch" :from from :to to
:subject subject :message-id message-id)
(setq desc (org-email-link-description))
- (setq link (org-make-link "notmuch:" "id:" message-id))
+ (setq link (concat "notmuch:" "id:" message-id))
(org-add-link-props :link link :description desc)
link)))
@@ -82,8 +82,8 @@ Can link to more than one message, if so all matching messages are shown."
(defun org-notmuch-search-store-link ()
"Store a link to a notmuch search or message."
(when (eq major-mode 'notmuch-search-mode)
- (let ((link (org-make-link "notmuch-search:"
- (org-link-escape notmuch-search-query-string)))
+ (let ((link (concat "notmuch-search:"
+ (org-link-escape notmuch-search-query-string)))
(desc (concat "Notmuch search: " notmuch-search-query-string)))
(org-store-link-props :type "notmuch-search"
:link link