[Emacs-diffs] emacs-24 r117006: * dired.el (dired-insert-set-properties): Do not consider

[Christopher Schmidt]

------------------------------------------------------------
revno: 117006
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17228
author: Michael Heerdegen <address@hidden>
committer: Christopher Schmidt <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-22 20:17:17 +0200
message:
  * 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)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired.el                  dired.el-20091113204419-o5vbwnq5f7feedwu-482

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-22 10:43:01 +0000
+++ b/lisp/ChangeLog    2014-04-22 18:17:17 +0000
@@ -1,3 +1,9 @@
+2014-04-22  Michael Heerdegen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2014-03-30 11:24:54 +0000
+++ b/lisp/dired.el     2014-04-22 18:17:17 +0000
@@ -1250,9 +1250,11 @@
     (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