From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christopher Schmidt Newsgroups: gmane.emacs.bugs Subject: bug#17228: 24.4.50; Dired with -R switch and hiding details: Missing chars etc. Date: Mon, 21 Apr 2014 13:58:44 -0400 (EDT) Message-ID: <87eh0q5zui@ristopher.com> References: <837g6kf4xu.fsf@gnu.org> <87eh0rttbw.fsf@web.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1398103234 17085 80.91.229.3 (21 Apr 2014 18:00:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Apr 2014 18:00:34 +0000 (UTC) Cc: Michael Heerdegen To: 17228@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 21 20:00:26 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WcIW0-0006iA-7J for geb-bug-gnu-emacs@m.gmane.org; Mon, 21 Apr 2014 20:00:24 +0200 Original-Received: from localhost ([::1]:50681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcIVz-0005pd-Sb for geb-bug-gnu-emacs@m.gmane.org; Mon, 21 Apr 2014 14:00:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcIVr-0005n5-5F for bug-gnu-emacs@gnu.org; Mon, 21 Apr 2014 14:00:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcIVg-0005cn-9v for bug-gnu-emacs@gnu.org; Mon, 21 Apr 2014 14:00:15 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:46170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcIVg-0005bn-7M for bug-gnu-emacs@gnu.org; Mon, 21 Apr 2014 14:00:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WcIVf-0005BU-6e for bug-gnu-emacs@gnu.org; Mon, 21 Apr 2014 14:00:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Christopher Schmidt Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Apr 2014 18:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17228 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.139810315119815 (code B ref -1); Mon, 21 Apr 2014 18:00:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 Apr 2014 17:59:11 +0000 Original-Received: from localhost ([127.0.0.1]:54327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcIUn-00059W-VX for submit@debbugs.gnu.org; Mon, 21 Apr 2014 13:59:10 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45480) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcIUk-00059N-BZ for submit@debbugs.gnu.org; Mon, 21 Apr 2014 13:59:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcIUe-0005NI-2N for submit@debbugs.gnu.org; Mon, 21 Apr 2014 13:59:06 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:38552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcIUd-0005NA-W5 for submit@debbugs.gnu.org; Mon, 21 Apr 2014 13:59:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcIUZ-0003Rd-4d for bug-gnu-emacs@gnu.org; Mon, 21 Apr 2014 13:58:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcIUS-0005Lk-St for bug-gnu-emacs@gnu.org; Mon, 21 Apr 2014 13:58:55 -0400 Original-Received: from ristopher.com ([81.4.108.209]:50849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcIUS-0005LA-Mv; Mon, 21 Apr 2014 13:58:48 -0400 Original-Received: by ristopher.com (Postfix, from userid 0) id 623B620A83; Mon, 21 Apr 2014 13:58:45 -0400 (EDT) In-Reply-To: <87eh0rttbw.fsf@web.de> (Michael Heerdegen's message of "Mon, 21 Apr 2014 02:33:07 +0200") Mail-Followup-To: bug-gnu-emacs@gnu.org, Eli Zaretskii , Michael Heerdegen X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:88192 Archived-At: --=-=-= Content-Type: text/plain Michael Heerdegen writes: > I don't think it's that hard to fix. `dired-insert-set-properties' > just doesn't check whether any non file line is an information line to > hide or something else (empty line or subdir header line). So, > something like this should do: [...] > WDYT? We should test it well, however, to be sure it does the same > for different `ls-lisp-use-insert-directory-program' values and such. Great! I can confirm that your change fixes the bug with and without ls emulation on my GNU/Linux system. Thank you very much. If there is no objection, I will commit the following patch to the emacs-24 branch tomorrow. --=-=-= Content-Type: text/x-diff Content-Disposition: inline +--- lisp/ChangeLog +++ lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-04-21 Michael Heerdegen + + * 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-20 Michael Albinus * net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if --- lisp/dired.el +++ lisp/dired.el @@ -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 --=-=-=--