Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

2 files changed, 7 insertions, 8 deletions

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 0298ad81a34..b92ca1244fb 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -940,7 +940,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   (x-apply-session-resources)
   (setq ns-initialized t))
 
-(add-to-list 'display-format-alist '("\\`ns\\'" . ns))
+;; Any display name is OK.
+(add-to-list 'display-format-alist '(".*" . ns))
 (add-to-list 'handle-args-function-alist '(ns . x-handle-args))
 (add-to-list 'frame-creation-function-alist '(ns . x-create-frame-with-faces))
 (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
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.