* cedet/semantic/db-file.el (semanticdb-default-save-directory):

* cedet/srecode/map.el (srecode-map-save-file):
* cedet/ede.el (ede-project-placeholder-cache-file): Use
locate-user-emacs-file.  Suggested by Juanma Barranquero.

4 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eeb3770db6b..cfc66b8bd05 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cedet/semantic/db-file.el (semanticdb-default-save-directory):
+        * cedet/srecode/map.el (srecode-map-save-file):
+        * cedet/ede.el (ede-project-placeholder-cache-file): Use
+        locate-user-emacs-file.  Suggested by Juanma Barranquero.
+
 2009-10-04  Glenn Morris  <rgm@gnu.org>
 
         * window.el (window-full-height-p): Add doc string.
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index e3f632ac761..03abf93704e 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -436,7 +436,7 @@ Do not set this to non-nil globally.  It is used internally.")
 ;;; The EDE persistent cache.
 ;;
 (defcustom ede-project-placeholder-cache-file
-  (expand-file-name "ede-projects.el" user-emacs-directory)
+  (locate-user-emacs-file "ede-projects.el" ".projects.ede")
   "File containing the list of projects EDE has viewed."
   :group 'ede
   :type 'file)
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index b3e3c7f70f8..4bd042ecefe 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -43,7 +43,7 @@
   :type 'string)
 
 (defcustom semanticdb-default-save-directory
-  (expand-file-name "semanticdb" user-emacs-directory)
+  (locate-user-emacs-file "semanticdb" ".semanticdb")
   "Directory name where semantic cache files are stored.
 If this value is nil, files are saved in the current directory.  If the value
 is a valid directory, then it overrides `semanticdb-default-file-name' and
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index 3c841386ab2..bdd6b21ef3a 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -45,7 +45,7 @@
   "The current map for global SRecode templates.")
 
 (defcustom srecode-map-save-file
-  (expand-file-name "srecode-map.el" user-emacs-directory)
+  (locate-user-emacs-file "srecode-map.el" ".srecode/srecode-map")
   "The save location for SRecode's map file.
 If the save file is nil, then the MAP is not saved between sessions."
   :group 'srecode