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#27817: 26.0.50; Dired: Support eshell/ls from the beginning if user want to Date: Tue, 25 Jul 2017 15:52:29 +0900 Message-ID: <87shhlypn6.fsf@calancha-pc> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1500965602 30006 195.159.176.226 (25 Jul 2017 06:53:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 25 Jul 2017 06:53:22 +0000 (UTC) To: 27817@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jul 25 08:53:11 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 1dZtiQ-00076C-D0 for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jul 2017 08:53:10 +0200 Original-Received: from localhost ([::1]:58843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZtiU-0006u1-Iw for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jul 2017 02:53:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZtiO-0006tr-JX for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:53:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZtiI-0006Ef-Sv for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:53:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:52307) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZtiI-0006EU-Ol for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dZtiI-0000HY-Ft for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:53: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: Tue, 25 Jul 2017 06:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27817 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.15009655691064 (code B ref -1); Tue, 25 Jul 2017 06:53:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Jul 2017 06:52:49 +0000 Original-Received: from localhost ([127.0.0.1]:54984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dZti5-0000H6-44 for submit@debbugs.gnu.org; Tue, 25 Jul 2017 02:52:49 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dZti3-0000Gv-9J for submit@debbugs.gnu.org; Tue, 25 Jul 2017 02:52:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZthw-00066J-IS for submit@debbugs.gnu.org; Tue, 25 Jul 2017 02:52:41 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:55575) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dZthw-000668-Ef for submit@debbugs.gnu.org; Tue, 25 Jul 2017 02:52:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZthv-0006kA-4R for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:52:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZths-000647-0h for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:52:39 -0400 Original-Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]:33727) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZthr-00063K-Qu for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 02:52:35 -0400 Original-Received: by mail-pf0-x22f.google.com with SMTP id s70so55516627pfs.0 for ; Mon, 24 Jul 2017 23:52:34 -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=pvKPRXf+17VNCxxnYDxaGl9IlPD1/mV/MFzNgj4e0oE=; b=I99rcPXXc1draQmTVv3cdOr332Ed29amcjFB4Jn89mbaH9SKt81m6yjEq7Nz0XeHRo /+DyfJGnv5PCHZaYkFJn+LgM3vaWpOelcJ/OWXzD67pF4sRaKiFyYVeS7RID9sEdezA+ FajcmkxFhOXTyYtxCctc71YkNACKLg0EDljifL3qXyOYjEvTsIoaSvt4Dn/k6xI7WMMj lmMewqrKCtg4/tJAwBCGo7MxN2FiV01sE2R2YM8FQi72WQ3o3I4dtp4IGwYRhR8+mwrX O/HiUBIlmQXNBVerWgE+5QeB1I+RBKLNd5C5DvwLQzBVEHFer79EOAful5ovgnNeWIEl STEw== 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=pvKPRXf+17VNCxxnYDxaGl9IlPD1/mV/MFzNgj4e0oE=; b=ZlSGTnmZ6S6oReM/qyOTiPN/+9a0gdX/J/boA6DlvJ0wKuYREqtYP6ukeyPLXOD/GW HCPWBKCU3+/naRh9fcfroLups7bzLpqOy1MnchdHwaT+leG0Eht2+VdBn9k6jV55YYOn wJEHf/H41/BGSV/rkc4l+OsxCOGJdo4qCsRXSQ4hPNntvPPM5zn8vLR5CHK+lTErFNab 93GhfUlzcn63KwDG5p3Vy61It9NDt8Ew0qx5Vi+YyXBMoEHnVZFXGJssFVgYhRemMhp8 /6bHoReOzCBoKrCCsd/XKFAGsWG1V4RYU1rdJqnymVs3Tj1W86hmqU1RHtqYPmdETJEk nmXw== X-Gm-Message-State: AIVw112PnfSiwJnbgauhyNYfb+yJVXeM44zkuZiYlwQLp+xZkzo2yz5X mGcJfD4cpA1tyqlj X-Received: by 10.98.63.212 with SMTP id z81mr18334919pfj.84.1500965552988; Mon, 24 Jul 2017 23:52:32 -0700 (PDT) Original-Received: from calancha-pc (170.224.128.101.dy.bbexcite.jp. [101.128.224.170]) by smtp.gmail.com with ESMTPSA id f74sm9851562pfk.131.2017.07.24.23.52.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 23:52:32 -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:134956 Archived-At: An user must be able to use Dired with eshell/ls at the beginning even if s?he doesn't have installed an external "ls" program. I) emacs -Q -l em-ls M-: (progn (setq insert-directory-program "foobar-ls" eshell-ls-use-in-dired t) (dired source-directory)) RET ;; We got an error because `insert-directory-program' was called. ;; Now compare with ls-lisp; in this case `insert-directory-program' ;; is not called. II) emacs -Q -l ls-lisp M-: (progn (setq insert-directory-program "foobar-ls" ls-lisp-use-insert-directory-program nil) (dired source-directory)) RET --8<-----------------------------cut here---------------start------------->8--- commit 6322f2932e9a083e01bb86aa219fc8256443c33f Author: Tino Calancha Date: Tue Jul 25 15:46:54 2017 +0900 Dired: Support eshell/ls from the beginning if user want to * lisp/dired.el (dired-insert-directory): Check for em-ls as well. * test/lisp/dired-tests.el (dired-test-bug27817): Add test. diff --git a/lisp/dired.el b/lisp/dired.el index 9d500a9f52..3b29c7129d 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1207,6 +1207,7 @@ dired-insert-directory ;; as indicated by `ls-lisp-use-insert-directory-program'. (not (and (featurep 'ls-lisp) (null ls-lisp-use-insert-directory-program))) + (not (and (featurep 'eshell) (bound-and-true-p eshell-ls-use-in-dired))) (or (if (eq dired-use-ls-dired 'unspecified) ;; Check whether "ls --dired" gives exit code 0, and ;; save the answer in `dired-use-ls-dired'. diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el index 69331457c0..601d65768b 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el @@ -175,5 +175,18 @@ (should (looking-at "src"))) (when (buffer-live-p buf) (kill-buffer buf))))) +(ert-deftest dired-test-bug27817 () + "Test for http://debbugs.gnu.org/27817 ." + (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) + (should (setq buf (dired source-directory)))) + (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-25 Repository revision: 565cfd9f6c19e4d2aa318efdf19bdc56175bd153