lisp/term/x-win.el (emacs-session-filename): Use `locate-user-emacs-file'.

2 files changed, 9 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e080df38bf0..0ae2a09cc4c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * term/x-win.el (emacs-session-filename): Use `locate-user-emacs-file'.
+
 2013-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/cl-loaddefs.el: Don't version-control any more.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 822df0e37e5..ab1556d5779 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -118,13 +118,11 @@ See also `emacs-session-save'.")
 
 (defun emacs-session-filename (session-id)
   "Construct a filename to save the session in based on SESSION-ID.
-If the directory ~/.emacs.d exists, we make a filename in there, otherwise
-a file in the home directory."
-  (let ((basename (concat "session." session-id))
-        (emacs-dir user-emacs-directory))
-    (expand-file-name (if (file-directory-p emacs-dir)
-                          (concat emacs-dir basename)
-                        (concat "~/.emacs-" basename)))))
+Return a filename in `user-emacs-directory', unless the session file
+already exists in the home directory."
+  (let ((basename (concat "session." session-id)))
+    (locate-user-emacs-file basename
+                            (concat ".emacs-" basename))))
 
 (defun emacs-session-save ()
   "This function is called when the window system is shutting down.