* lisp/desktop.el (desktop-save): Default to saving in .emacs.d,

since PWD is no longer in desktop-path by default.

Fixes: debbugs:15319

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa3319c7a67f3054939084c9e397071fc9ceffcb..c939b9f6f893fb1ccfd67d7b57ee568f2ce82511 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-10  Glenn Morris  <rgm@gnu.org>
 
+       * desktop.el (desktop-save): Default to saving in .emacs.d,
+       since PWD is no longer in desktop-path by default.  (Bug#15319)
+
        * menu-bar.el (menu-bar-options-menu): Remove text-mode auto-fill,
        now that text mode has a menu with the same entry.
        (menu-bar-text-mode-auto-fill): Remove now unused func.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 1bbc33cb244fd43d2a45af9c03ef1b916d811088..79c06f15fb6fdd7841d01822b370c4aa8564abfd 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,7 +1,6 @@
 ;;; desktop.el --- save partial status of Emacs when killed -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1995, 1997, 2000-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1993-1995, 1997, 2000-2013 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: convenience
@@ -922,7 +921,13 @@ Parameter DIRNAME specifies where to save the desktop file.
 Optional parameter RELEASE says whether we're done with this desktop.
 If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
 and don't save the buffer if they are the same."
-  (interactive "DDirectory to save desktop file in: ")
+  (interactive (list
+                ;; Or should we just use (car desktop-path)?
+                (let ((default (if (member "." desktop-path)
+                                   default-directory
+                                 user-emacs-directory)))
+                  (read-directory-name "Directory to save desktop file in: "
+                                       default default t))))
   (setq desktop-dirname (file-name-as-directory (expand-file-name dirname)))
   (save-excursion
     (let ((eager desktop-restore-eager)