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

Merge branch 'maint'

This commit is contained in:
Achim Gratz 2012-09-11 21:44:37 +02:00
parent b335ce2aa5 c5977e7e9d
commit 2eb1456bfd
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-compat.el
View File

@ -460,12 +460,6 @@ With two arguments, return floor and remainder of their quotient."
(defun org-release () "N/A") (defun org-release () "N/A")
(defun org-git-version () "N/A !!check installation!!")))))) (defun org-git-version () "N/A !!check installation!!"))))))
(defun org-random ()
"Call ̀random' appropriately."
(if (or (featurep 'xemacs) (version< emacs-version "24.2.50.1"))
(random t)
(random)))
(provide 'org-compat) (provide 'org-compat)
;;; org-compat.el ends here ;;; org-compat.el ends here

2
lisp/org-id.el
View File

@ -317,7 +317,7 @@ So a typical ID could look like \"Org:4nd91V40HI\"."
(defun org-id-uuid () (defun org-id-uuid ()
"Return string with random (version 4) UUID." "Return string with random (version 4) UUID."
(let ((rnd (md5 (format "%s%s%s%s%s%s%s" (let ((rnd (md5 (format "%s%s%s%s%s%s%s"
(org-random) (random)
(current-time) (current-time)
(user-uid) (user-uid)
(emacs-pid) (emacs-pid)