Include changes from downstream Emacs.

lisp/org-id.el

@@ -116,7 +116,8 @@ be added."
   :group 'org-id
   :type 'boolean)
 
-(defcustom org-id-locations-file "~/.org-id-locations"
+(defcustom org-id-locations-file (convert-standard-filename
+				  "~/.org-id-locations")
   "The file for remembering the last ID number generated."
   :group 'org-id
   :type 'file)

lisp/org-publish.el

@@ -276,7 +276,8 @@ When nil, do no timestamp checking and always publish all files."
   :group 'org-publish
   :type 'boolean)
 
-(defcustom org-publish-timestamp-directory "~/.org-timestamps/"
+(defcustom org-publish-timestamp-directory (convert-standard-filename 
+					    "~/.org-timestamps/")
   "Name of directory in which to store publishing timestamps."
   :group 'org-publish
   :type 'directory)

lisp/org.el

@@ -1205,7 +1205,7 @@ Used by the hooks for remember.el."
   :group 'org-remember
   :type 'directory)
 
-(defcustom org-default-notes-file "~/.notes"
+(defcustom org-default-notes-file (convert-standard-filename "~/.notes")
   "Default target for storing notes.
 Used by the hooks for remember.el.  This can be a string, or nil to mean
 the value of `remember-data-file'.