[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a0edb01: `auto-save-list-file-prefix' can be a dire
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] master a0edb01: `auto-save-list-file-prefix' can be a directory name |
Date: |
Mon, 23 Feb 2015 14:13:39 +0000 |
branch: master
commit a0edb0160b482bdb9ea48b82e440a3ec5763dd11
Author: Sam Steingold <address@hidden>
Commit: Sam Steingold <address@hidden>
`auto-save-list-file-prefix' can be a directory name
* lisp/files.el (recover-session): Handle `auto-save-list-file-prefix'
being a directory (empty non-directory part).
---
lisp/ChangeLog | 5 +++++
lisp/files.el | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af8845b..2c22ed2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23 Sam Steingold <address@hidden>
+
+ * files.el (recover-session): Handle `auto-save-list-file-prefix'
+ being a directory (empty non-directory part).
+
2015-02-23 Magnus Henoch <address@hidden>
* net/sasl.el (sasl-mechanism-alist): Refer to sasl-scram-rfc
diff --git a/lisp/files.el b/lisp/files.el
index 1914ad8..42b00ac 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5664,13 +5664,14 @@ Then you'll be asked about a number of files to
recover."
(interactive)
(if (null auto-save-list-file-prefix)
(error "You set `auto-save-list-file-prefix' to disable making session
files"))
- (let ((dir (file-name-directory auto-save-list-file-prefix)))
+ (let ((dir (file-name-directory auto-save-list-file-prefix))
+ (nd (file-name-nondirectory auto-save-list-file-prefix)))
(unless (file-directory-p dir)
(make-directory dir t))
(unless (directory-files dir nil
- (concat "\\`" (regexp-quote
- (file-name-nondirectory
- auto-save-list-file-prefix)))
+ (if (string= "" nd)
+ directory-files-no-dot-files-regexp
+ (concat "\\`" (regexp-quote nd)))
t)
(error "No previous sessions to recover")))
(let ((ls-lisp-support-shell-wildcards t))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a0edb01: `auto-save-list-file-prefix' can be a directory name,
Sam Steingold <=