procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Fixes: debbugs:15319
This commit is contained in:
Glenn Morris 2013-10-09 21:03:11 -04:00
parent f3606ef766
commit 9271e90e73
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

11
lisp/desktop.el
View file

@ -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)