summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/dired.el8
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2cd739a53d..679c9ab51d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-22 Michael Heerdegen <michael_heerdegen@web.de>
+
+ * dired.el (dired-insert-set-properties): Do not consider
+ subdirectory headings and empty lines to be information that
+ `dired-hide-details-mode' should hide. (Bug#17228)
+
2014-04-22 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
diff --git a/lisp/dired.el b/lisp/dired.el
index b3c67343a15..1cce5bc6665 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