Merge branch 'maint'

lisp/org-compat.el

@@ -460,6 +460,12 @@ With two arguments, return floor and remainder of their quotient."
 	   (defun org-release () "N/A")
 	   (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)
 
 ;;; org-compat.el ends here

lisp/org-id.el

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