[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ccea37f: Work around bad interaction between dired-
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master ccea37f: Work around bad interaction between dired-omit-mode and recover-session |
Date: |
Wed, 9 Oct 2019 19:35:52 -0400 (EDT) |
branch: master
commit ccea37f6ac503d2e94ca3dc0aa1aad079a2cc8d5
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Work around bad interaction between dired-omit-mode and recover-session
* lisp/files.el (recover-session): Add ugly hack to try to ensure
that we're actually showing the session files (bug#36223).
---
lisp/files.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/files.el b/lisp/files.el
index 20bc204..fdd7c75 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6211,6 +6211,8 @@ an auto-save file."
(after-find-file nil nil t))
(t (user-error "Recover-file canceled")))))
+(defvar dired-mode-hook)
+
(defun recover-session ()
"Recover auto save files from a previous Emacs session.
This command first displays a Dired buffer showing you the
@@ -6230,7 +6232,12 @@ Then you'll be asked about a number of files to recover."
(concat "\\`" (regexp-quote nd)))
t)
(error "No previous sessions to recover")))
- (let ((ls-lisp-support-shell-wildcards t))
+ (require 'dired)
+ (let ((ls-lisp-support-shell-wildcards t)
+ ;; Ensure that we don't omit the session files as the user may
+ ;; have (as suggested by the manual) `dired-omit-mode' in the
+ ;; hook.
+ (dired-mode-hook (delete 'dired-omit-mode dired-mode-hook)))
(dired (concat auto-save-list-file-prefix "*")
(concat dired-listing-switches " -t")))
(use-local-map (nconc (make-sparse-keymap) (current-local-map)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master ccea37f: Work around bad interaction between dired-omit-mode and recover-session,
Lars Ingebrigtsen <=