ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Bastien Guerry 2012-08-20 14:03:15 +02:00
parent d6db2566d9
commit 502e538020
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/lisp/org-bookmark.el
View File

@ -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)

4
contrib/lisp/org-git-link.el
View File

@ -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)

6
contrib/lisp/org-notmuch.el
View File

@ -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