X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3e93bafb95608467e438ba7f725fd1f020669f8c..f828c69dba3665e88493d103c92184d52bb6fa50:/lisp/dired.el

diff --git a/lisp/dired.el b/lisp/dired.el
index b1b22a6a99..1cce5bc666 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1250,9 +1250,11 @@ see `dired-use-ls-dired' for more details.")
     (while (< (point) end)
       (ignore-errors
 	(if (not (dired-move-to-filename))
-	    (put-text-property (line-beginning-position)
-			       (1+ (line-end-position))
-			       'invisible 'dired-hide-details-information)
+	    (unless (or (looking-at-p "^$")
+			(looking-at-p dired-subdir-regexp))
+	      (put-text-property (line-beginning-position)
+				 (1+ (line-end-position))
+				 'invisible 'dired-hide-details-information))
 	  (put-text-property (+ (line-beginning-position) 1) (1- (point))
 			     'invisible 'dired-hide-details-detail)
 	  (add-text-properties
@@ -2136,7 +2138,8 @@ Otherwise, display it in another buffer."
 (defun dired-display-file ()
   "In Dired, display this file or directory in another window."
   (interactive)
-  (display-buffer (find-file-noselect (dired-get-file-for-visit))))
+  (display-buffer (find-file-noselect (dired-get-file-for-visit))
+		  t))
 
 ;;; Functions for extracting and manipulating file names in Dired buffers.
 
@@ -3087,7 +3090,7 @@ argument or confirmation)."
       (apply function args)
     (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*"))))
       (with-current-buffer buffer
-	(with-temp-buffer-window
+	(with-current-buffer-window
 	 buffer
 	 (cons 'display-buffer-below-selected
 	       '((window-height . fit-window-to-buffer)))
@@ -3639,6 +3642,7 @@ With a prefix argument, edit the current listing switches instead."
 	;; Remove a switch of the form -XtY for some X and Y.
 	(setq dired-actual-switches
 	      (replace-match "" t t dired-actual-switches 3))))
+
     ;; Now, if we weren't sorting by date before, add the -t switch.
     ;; Some simple-minded ls implementations (eg ftp servers) only
     ;; allow a single option string, so try not to add " -t" if possible.
@@ -3845,7 +3849,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
   (let* ((dired-dir (car misc-data))
          (dir (if (consp dired-dir) (car dired-dir) dired-dir)))
     (if (file-directory-p (file-name-directory dir))
-        (progn
+        (with-demoted-errors "Desktop: Problem restoring directory: %S"
           (dired dired-dir)
           ;; The following elements of `misc-data' are the keys
           ;; from `dired-subdir-alist'.
@@ -3861,7 +3865,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 
 ;;; Start of automatically extracted autoloads.
 
-;;;### (autoloads nil "dired-aux" "dired-aux.el" "bd357e0a0e74eb553e90e0b6d19cf611")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "1a8e2a4a9117ab3a2586aa001358d3fb")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\