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#16406: load prefers directories rather than searching load-path Date: Sat, 03 Sep 2016 22:00:42 +0300 Message-ID: <83twdwdd0l.fsf@gnu.org> References: <8737lyulkl.fsf@users.sourceforge.net> <878tv9ndce.fsf@users.sourceforge.net> <831t10evoh.fsf@gnu.org> <87r390aknq.fsf@users.sourceforge.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1472929286 785 195.159.176.226 (3 Sep 2016 19:01:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 3 Sep 2016 19:01:26 +0000 (UTC) Cc: 16406@debbugs.gnu.org To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Sep 03 21:01:22 2016 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 1bgGBs-0007tu-Ch for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Sep 2016 21:01:20 +0200 Original-Received: from localhost ([::1]:47472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGBp-00034E-0R for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Sep 2016 15:01:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGBg-00032K-Uw for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:01:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgGBa-0004qd-Jn for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:01:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGBa-0004qZ-GW for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:01:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bgGBa-00014e-A0 for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:01: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, 03 Sep 2016 19:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16406 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 16406-submit@debbugs.gnu.org id=B16406.14729292614114 (code B ref 16406); Sat, 03 Sep 2016 19:01:02 +0000 Original-Received: (at 16406) by debbugs.gnu.org; 3 Sep 2016 19:01:01 +0000 Original-Received: from localhost ([127.0.0.1]:48969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgGBZ-00014I-EK for submit@debbugs.gnu.org; Sat, 03 Sep 2016 15:01:01 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgGBX-000145-LR for 16406@debbugs.gnu.org; Sat, 03 Sep 2016 15:00:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgGBP-0004q5-FH for 16406@debbugs.gnu.org; Sat, 03 Sep 2016 15:00:54 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:43842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGBP-0004q1-C0; Sat, 03 Sep 2016 15:00:51 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4126 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bgGBM-0006Tm-9y; Sat, 03 Sep 2016 15:00:50 -0400 In-reply-to: <87r390aknq.fsf@users.sourceforge.net> (npostavs@users.sourceforge.net) 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:122908 Archived-At: > From: npostavs@users.sourceforge.net > Cc: 16406@debbugs.gnu.org, rgm@gnu.org > Date: Sat, 03 Sep 2016 14:43:53 -0400 > > > I do agree that the file-exists-p test in command-line-1 should be > > replaced with a test that doesn't let directories through. But I > > don't understand why using locate-file here is a good idea. > > Hmm, I seem to have confused things by trying to combine the fix for > 16406 and 17848. Just replacing the file-exists-p test, as in the patch > below, is enough to fix this bug. Let's look at 17848 separately. > > >From ba8ddc2e039fe982bdfa46519c003808be9ddff3 Mon Sep 17 00:00:00 2001 > From: Noam Postavsky > Date: Sun, 21 Aug 2016 10:51:38 -0400 > Subject: [PATCH v3] Don't --load directories > > * lisp/startup.el (command-line-1): Only pass expanded FILENAME argument > of --load when it refers to a normal file, since `load' doesn't handle > directories (Bug #16406). > --- > lisp/startup.el | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lisp/startup.el b/lisp/startup.el > index fcdc376..45beefb 100644 > --- a/lisp/startup.el > +++ b/lisp/startup.el > @@ -2393,7 +2393,7 @@ command-line-1 > ;; Take file from default dir if it exists there; > ;; otherwise let `load' search for it. > (file-ex (expand-file-name file))) > - (when (file-exists-p file-ex) > + (when (and file-ex (file-regular-p file-ex)) > (setq file file-ex)) > (load file nil t))) OK. But isn't the "and file-ex" test unnecessary? It wasn't required for file-exists-p, so why is it for file-regular-p? Thanks.