From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Maus Subject: [PATCH 2/2] Use new customization value for `org-id-method'. Date: Tue, 18 May 2010 08:11:00 +0200 Message-ID: <1274163060-10251-3-git-send-email-dmaus@ictsoc.de> References: Return-path: Received: from [140.186.70.92] (port=46748 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEG23-0001qC-ES for emacs-orgmode@gnu.org; Tue, 18 May 2010 02:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEG1u-0003x0-OI for emacs-orgmode@gnu.org; Tue, 18 May 2010 02:11:59 -0400 Received: from mysql1.xlhost.de ([213.202.242.106]:45686) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEG1u-0003wv-Ek for emacs-orgmode@gnu.org; Tue, 18 May 2010 02:11:50 -0400 In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Silently accept the old value for backward compatibility. --- lisp/ChangeLog | 3 +++ lisp/org-id.el | 28 ++++++++++++---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fafe7db..b143fbf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,9 @@ * org-id.el (org-id-uuid): New function. Return string with random (version 4) UUID. + (org-id-method): Make 'uuid the new default value. + (org-id-new): Use `org-id-uuid' if call to uuidgen program + does not return a UUID. 2010-05-15 Carsten Dominik diff --git a/lisp/org-id.el b/lisp/org-id.el index 6175eee..66b1790 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -37,8 +37,9 @@ ;; time of the ID, with microsecond accuracy. This virtually ;; guarantees globally unique identifiers, even if several people are ;; creating IDs at the same time in files that will eventually be used -;; together. As an external method `uuidgen' is supported, if installed -;; on the system. +;; together. +;; +;; By default Org uses UUIDs as global unique identifiers. ;; ;; This file defines the following API: ;; @@ -84,18 +85,9 @@ :group 'org-id :type 'string) -(defcustom org-id-method - (condition-case nil - (if (string-match "\\`[-0-9a-fA-F]\\{36\\}\\'" - (org-trim (shell-command-to-string - org-id-uuid-program))) - 'uuidgen - 'org) - (error 'org)) +(defcustom org-id-method 'uuid "The method that should be used to create new IDs. -If `uuidgen' is available on the system, it will be used as the default method. -if not, the method `org' is used. An ID will consist of the optional prefix specified in `org-id-prefix', and a unique part created by the method this variable specifies. @@ -105,11 +97,13 @@ org Org's own internal method, using an encoding of the current time to microsecond accuracy, and optionally the current domain of the computer. See the variable `org-id-include-domain'. -uuidgen Call the external command uuidgen." +uuid Create random (version 4) UUIDs. If the program defined in + `org-id-uuid-program' is available it is used to create the ID. + Otherwise an internal functions is used." :group 'org-id :type '(choice (const :tag "Org's internal method" org) - (const :tag "external: uuidgen" uuidgen))) + (const :tag "external: uuidgen" uuid))) (defcustom org-id-prefix nil "The prefix for IDs. @@ -306,8 +300,10 @@ So a typical ID could look like \"Org:4nd91V40HI\"." unique) (if (equal prefix ":") (setq prefix "")) (cond - ((eq org-id-method 'uuidgen) - (setq unique (org-trim (shell-command-to-string org-id-uuid-program)))) + ((memq org-id-method '(uuidgen uuid)) + (setq unique (org-trim (shell-command-to-string org-id-uuid-program))) + (unless (org-uuidgen-p unique) + (setq unique (org-id-uuid)))) ((eq org-id-method 'org) (let* ((etime (org-id-reverse-string (org-id-time-to-b36))) (postfix (if org-id-include-domain -- 1.7.1