From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#27843: 26.0.50; Dired w/ eshell insert subdirs content when dir-or-list is a cons Date: Thu, 27 Jul 2017 12:19:08 +0900 Message-ID: <87bmo6sh1v.fsf@calancha-pc> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1501125620 4079 195.159.176.226 (27 Jul 2017 03:20:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 27 Jul 2017 03:20:20 +0000 (UTC) To: 27843@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 27 05:20:14 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 1daZLM-0000L0-A6 for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Jul 2017 05:20:08 +0200 Original-Received: from localhost ([::1]:40993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daZLQ-0001tN-IU for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Jul 2017 23:20:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daZLH-0001tH-Eb for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:20:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daZLG-0001cb-Ag for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:20:03 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1daZLG-0001cQ-8A for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:20:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1daZLG-0002mp-2b for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:20:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 27 Jul 2017 03:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27843 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.150112556810663 (code B ref -1); Thu, 27 Jul 2017 03:20:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Jul 2017 03:19:28 +0000 Original-Received: from localhost ([127.0.0.1]:57822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daZKh-0002lv-QE for submit@debbugs.gnu.org; Wed, 26 Jul 2017 23:19:28 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daZKf-0002li-Pp for submit@debbugs.gnu.org; Wed, 26 Jul 2017 23:19:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daZKZ-0000mY-7t for submit@debbugs.gnu.org; Wed, 26 Jul 2017 23:19:20 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:43172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daZKZ-0000mK-4o for submit@debbugs.gnu.org; Wed, 26 Jul 2017 23:19:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daZKX-0001rM-MU for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:19:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daZKW-0000jX-BG for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:19:17 -0400 Original-Received: from mail-pg0-x22e.google.com ([2607:f8b0:400e:c05::22e]:36665) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1daZKW-0000gt-5o for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 23:19:16 -0400 Original-Received: by mail-pg0-x22e.google.com with SMTP id 125so92138251pgi.3 for ; Wed, 26 Jul 2017 20:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=Z2t6x2Ma0LloV57Aivb8d8GC4T5D85km0qBNS61Eu14=; b=HzzjlgB62g+lY/J9dQ1o3UKT2lcffSM5JzW2tNsScdEEr1an6ehvhOVotQp9SyuFj+ GpQ7KCnIVgzGiJtjT46VHrrrSek+R5lHKHs1t7BEkO2X//Mw6xGB1VGELVCKb0ruKNxB FvB/DZNNjfZtXcfJkjS/2nfoG0+qJvmtfGBhdkxCjImMRTNT2WGvUn2KQiucqs1aTabf fEAZQuTqhx530SboML98IXbIoaJlYnuYLG9optNWVfxJhH+APCjKBxV8aHef8lfcRftz sakkJeOy8ZHHJviBbBzzQxUxq2TsTeLO1NAnpdXhc/eWC+0/EW6DQgC1WcmoDCeJA1zN 1Ngw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=Z2t6x2Ma0LloV57Aivb8d8GC4T5D85km0qBNS61Eu14=; b=gy7x+ZDNbO9TmIfQCPeMvfh0Hh1iQP8pBiTgfMkv50ZQSGkJZhESxzgfYlQ91MsUJZ F5bobfAGnRYfgtB7WSG2YkFYc7fmoVVAuQTsfYLUX39z0uHEtV4sd8kkox0qPLnLbZQ3 XnDKU/DeXgT7ghIJguzHVtXqb9vvRLRiYpktGxnlSzTmvhY1Wj9EPDsAsja8KqzVL4Te yiW+sTrnPyPM0W1GtvTbxuZC0qqHBljEV106CvuxboTeMb22hhFMc+kuKhWtF/V/xhhS eNUD3rYkQcvuhq0wzfhBAukErrYngcxLQGVyFX97Ns80MyNIAyumGBWWjdmo0oJiKWKb nDRA== X-Gm-Message-State: AIVw112pzkOq416IY8u8QxIEj/srTLXEvdHFljCZYivCwbqlWu1RKnqt PoLsTZXDWJhsrGJA X-Received: by 10.84.248.13 with SMTP id p13mr2951437pll.312.1501125552895; Wed, 26 Jul 2017 20:19:12 -0700 (PDT) Original-Received: from calancha-pc ([240f:6e:fb29:1:9ee6:2511:da80:1c7e]) by smtp.gmail.com with ESMTPSA id e24sm13035749pfk.180.2017.07.26.20.19.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Jul 2017 20:19:12 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:135038 Archived-At: emacs -r -Q -l ls-lisp -eval "(setq ls-lisp-use-insert-directory-program t)" ;; Following form must lists just 2 entries in Dired: M-: (dired (list source-directory "README" "lisp")) RET ;; In fact, it inserts the full content of subdir "lisp". --8<-----------------------------cut here---------------start------------->8--- commit 6216ea9470feabf22333988f02203334fcfd2e26 Author: Tino Calancha Date: Thu Jul 27 12:09:00 2017 +0900 Dired w/ eshell: Don't insert subdirs content if dir-or-list is a cons * lisp/eshell/em-ls.el (eshell-ls--insert-directory): Append '("-d") into 'eshell-ls-dired-initial-args' when 'dired-directory' is a cons (Bug#27843). * test/lisp/dired-tests.el (dired-test-bug27843): Add test. diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 79799db30b..367ec69489 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -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))))))))) (defsubst eshell/ls (&rest args) "An alias version of `eshell-do-ls'." diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el index 601d65768b..63b1e45e1f 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el @@ -188,5 +188,20 @@ (customize-set-variable 'eshell-ls-use-in-dired orig) (and (buffer-live-p buf) (kill-buffer))))) +(ert-deftest dired-test-bug27843 () + "Test for http://debbugs.gnu.org/27843 ." + (require 'em-ls) + (let ((orig eshell-ls-use-in-dired) + (dired-use-ls-dired 'unspecified) + buf insert-directory-program) + (unwind-protect + (progn + (customize-set-variable 'eshell-ls-use-in-dired t) + (setq buf (dired (list source-directory "lisp"))) + (dired-toggle-marks) + (should-not (cdr (dired-get-marked-files)))) + (customize-set-variable 'eshell-ls-use-in-dired orig) + (and (buffer-live-p buf) (kill-buffer))))) + (provide 'dired-tests) ;; dired-tests.el ends here --8<-----------------------------cut here---------------end--------------->8--- In GNU Emacs 26.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.11) of 2017-07-26 Repository revision: e1e8d2e229f48b3cee765f7cf27ae04ee4401d85