From ccea37f6ac503d2e94ca3dc0aa1aad079a2cc8d5 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 10 Oct 2019 01:34:14 +0200 Subject: [PATCH] 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 20bc204b061..fdd7c75ced6 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))) -- 2.30.2