[Emacs-diffs] trunk r113103: lisp/term/x-win.el (emacs-session-filename): Use `locate-user-emacs-file'.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113103
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-20 23:58:29 +0200
message:
  lisp/term/x-win.el (emacs-session-filename): Use `locate-user-emacs-file'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/x-win.el             xwin.el-20091113204419-o5vbwnq5f7feedwu-113

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-20 20:01:51 +0000
+++ b/lisp/ChangeLog    2013-06-20 21:58:29 +0000
@@ -1,3 +1,7 @@
+2013-06-20  Juanma Barranquero  <address@hidden>
+
+       * term/x-win.el (emacs-session-filename): Use `locate-user-emacs-file'.
+
 2013-06-20  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/cl-loaddefs.el: Don't version-control any more.

=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el        2013-04-06 14:06:39 +0000
+++ b/lisp/term/x-win.el        2013-06-20 21:58:29 +0000
@@ -118,13 +118,11 @@
 
 (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.