From: Alexander Klimov <alserkli@inbox.ru>
Date: Thu, 9 Jun 2011 05:33:26 +0000 (-0700)
Subject: Small fixes for dired-listing-switches usage.
X-Git-Tag: emacs-pretest-24.0.90~104^2~606
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=254c37a51d596859d957168aa79217e1a0eb1c69;p=emacs.git

Small fixes for dired-listing-switches usage.

Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg01000.html

* lisp/mail/sendmail.el (mail-recover-1, mail-recover):
* lisp/files.el (recover-file, recover-session):
Handle dired-listing-switches not being just a single short option.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d1fb9ffceb..1b61621708b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-09  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
+
+	* mail/sendmail.el (mail-recover-1, mail-recover):
+	* files.el (recover-file, recover-session):
+	Handle dired-listing-switches not being just a single short option.
+
 2011-06-09  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/appt.el (appt-display-message, appt-disp-window):
diff --git a/lisp/files.el b/lisp/files.el
index cc1ad23925d..5b950e0d409 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5256,7 +5256,7 @@ non-nil, it is called instead of rereading visited file contents."
 	       (save-excursion
 		 (let ((switches dired-listing-switches))
 		   (if (file-symlink-p file)
-		       (setq switches (concat switches "L")))
+		       (setq switches (concat switches " -L")))
 		   (set-buffer standard-output)
 		   ;; Use insert-directory-safely, not insert-directory,
 		   ;; because these files might not exist.  In particular,
@@ -5299,7 +5299,7 @@ Then you'll be asked about a number of files to recover."
       (error "No previous sessions to recover")))
   (let ((ls-lisp-support-shell-wildcards t))
     (dired (concat auto-save-list-file-prefix "*")
-	   (concat dired-listing-switches "t")))
+	   (concat dired-listing-switches " -t")))
   (save-excursion
     (goto-char (point-min))
     (or (looking-at " Move to the session you want to recover,")
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 2c5fa014a94..f4ef9b91903 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1801,7 +1801,7 @@ The seventh argument ACTIONS is a list of actions to take
       ;; unbound on exit from the let.
       (require 'dired)
       (let ((dired-trivial-filenames t))
-	(dired-other-window wildcard (concat dired-listing-switches "t")))
+	(dired-other-window wildcard (concat dired-listing-switches " -t")))
       (rename-buffer "*Auto-saved Drafts*" t)
       (save-excursion
 	(goto-char (point-min))
@@ -1881,7 +1881,7 @@ you can move to one of them and type C-c C-c to recover that one."
 		  ;; `ls' is not a standard program (it will use
 		  ;; ls-lisp instead).
 		  (dired-noselect file-name
-				  (concat dired-listing-switches "t"))))
+				  (concat dired-listing-switches " -t"))))
 	     (save-selected-window
 	       (select-window (display-buffer dispbuf t))
 	       (goto-char (point-min))