From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#27843: 26.0.50; Dired w/ eshell insert subdirs content when dir-or-list is a cons Date: Sat, 29 Jul 2017 12:07:35 +0300 Message-ID: <83h8xv392g.fsf@gnu.org> References: <87bmo6sh1v.fsf@calancha-pc> <87eft2ut5u.fsf@calancha-pc> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1501319300 31853 195.159.176.226 (29 Jul 2017 09:08:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 29 Jul 2017 09:08:20 +0000 (UTC) Cc: 27843@debbugs.gnu.org To: Tino Calancha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 29 11:08:15 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dbNjI-0007ob-AY for geb-bug-gnu-emacs@m.gmane.org; Sat, 29 Jul 2017 11:08:12 +0200 Original-Received: from localhost ([::1]:51596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbNjM-0000Fx-EZ for geb-bug-gnu-emacs@m.gmane.org; Sat, 29 Jul 2017 05:08:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbNj9-0000Fm-4s for bug-gnu-emacs@gnu.org; Sat, 29 Jul 2017 05:08:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbNj8-0002v3-D9 for bug-gnu-emacs@gnu.org; Sat, 29 Jul 2017 05:08:03 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dbNj8-0002uu-9d for bug-gnu-emacs@gnu.org; Sat, 29 Jul 2017 05:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dbNj8-0000up-4O for bug-gnu-emacs@gnu.org; Sat, 29 Jul 2017 05:08:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 29 Jul 2017 09:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27843 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 27843-submit@debbugs.gnu.org id=B27843.15013192763508 (code B ref 27843); Sat, 29 Jul 2017 09:08:02 +0000 Original-Received: (at 27843) by debbugs.gnu.org; 29 Jul 2017 09:07:56 +0000 Original-Received: from localhost ([127.0.0.1]:60582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dbNj1-0000uU-CH for submit@debbugs.gnu.org; Sat, 29 Jul 2017 05:07:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dbNiz-0000uI-Na for 27843@debbugs.gnu.org; Sat, 29 Jul 2017 05:07:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbNir-0002fe-5i for 27843@debbugs.gnu.org; Sat, 29 Jul 2017 05:07:48 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbNir-0002fa-2f; Sat, 29 Jul 2017 05:07:45 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4223 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dbNiq-00039l-Al; Sat, 29 Jul 2017 05:07:44 -0400 In-reply-to: <87eft2ut5u.fsf@calancha-pc> (message from Tino Calancha on Thu, 27 Jul 2017 18:26:53 +0900) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:135111 Archived-At: > From: Tino Calancha > Date: Thu, 27 Jul 2017 18:26:53 +0900 > > Tino Calancha writes: > > > @@ -276,8 +276,10 @@ eshell-ls--insert-directory > > (let ((insert-func 'insert) > > (error-func 'insert) > > (flush-func 'ignore) > > - eshell-ls-dired-initial-args) > > - (eshell-do-ls (append switches (list file))))))))) > > + (switches (append eshell-ls-dired-initial-args > > + (and (consp dired-directory) (list "-d")) > > + switches))) > > + (eshell-do-ls (nconc switches (list file))))))))) > Not just when dired-directory is a cons, _also_ if WILDCARD is non-nil > we must just list the directory entry. OK, thanks.