mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge upstream Org (from commit acbbe2)

Browse source
This commit is contained in:
Bastien Guerry 2012-10-26 16:42:05 +02:00
parent ccc83f50a4
commit bdebdb64b3
56 changed files with 1253 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/org/org-id.el
View file

@ -233,7 +233,6 @@ With optional argument FORCE, force the creation of a new ID."
(org-entry-put (point) "ID" nil))
(org-id-get (point) 'create))
;;;###autoload
(defun org-id-copy ()
"Copy the ID of the entry at point to the kill ring.
Create an ID if necessary."
@ -259,7 +258,6 @@ In any case, the ID of the entry is returned."
(org-id-add-location id (buffer-file-name (buffer-base-buffer)))
id)))))
;;;###autoload
(defun org-id-get-with-outline-path-completion (&optional targets)
"Use outline-path-completion to retrieve the ID of an entry.
TARGETS may be a setting for `org-refile-targets' to define the eligible
@ -276,7 +274,6 @@ It returns the ID of the entry. If necessary, the ID is created."
(prog1 (org-id-get pom 'create)
(move-marker pom nil))))
;;;###autoload
(defun org-id-get-with-outline-drilling (&optional targets)
"Use an outline-cycling interface to retrieve the ID of an entry.
This only finds entries in the current buffer, using `org-get-location'.
@ -681,4 +678,8 @@ optional argument MARKERP, return the position as a new marker."
(provide 'org-id)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-id.el ends here