From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: npostavs@users.sourceforge.net Newsgroups: gmane.emacs.bugs Subject: bug#16406: load prefers directories rather than searching load-path Date: Sat, 03 Sep 2016 15:12:49 -0400 Message-ID: <87mvjoajbi.fsf@users.sourceforge.net> References: <8737lyulkl.fsf@users.sourceforge.net> <878tv9ndce.fsf@users.sourceforge.net> <831t10evoh.fsf@gnu.org> <87r390aknq.fsf@users.sourceforge.net> <83twdwdd0l.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1472930000 4487 195.159.176.226 (3 Sep 2016 19:13:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 3 Sep 2016 19:13:20 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: 16406@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Sep 03 21:13:17 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 1bgGNP-0000f0-KI for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Sep 2016 21:13:15 +0200 Original-Received: from localhost ([::1]:47494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGNN-0005vu-Fi for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Sep 2016 15:13:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGNG-0005si-UD for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:13:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgGNC-0006e6-M5 for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:13:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgGNC-0006e2-IW for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:13:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bgGNC-0001LM-Ay for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 15:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: npostavs@users.sourceforge.net Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Sep 2016 19:13: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.14729299575133 (code B ref 16406); Sat, 03 Sep 2016 19:13:02 +0000 Original-Received: (at 16406) by debbugs.gnu.org; 3 Sep 2016 19:12:37 +0000 Original-Received: from localhost ([127.0.0.1]:48973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgGMn-0001Kj-Hq for submit@debbugs.gnu.org; Sat, 03 Sep 2016 15:12:37 -0400 Original-Received: from mail-it0-f45.google.com ([209.85.214.45]:37493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgGMl-0001KV-Ch for 16406@debbugs.gnu.org; Sat, 03 Sep 2016 15:12:35 -0400 Original-Received: by mail-it0-f45.google.com with SMTP id e124so92635845ith.0 for <16406@debbugs.gnu.org>; Sat, 03 Sep 2016 12:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=A1FVtvt8JaGY+Zkvo43+9f64QVvd3yxPikd3l402PXA=; b=SKEeMKBouilgls174+Un+He2D9HZnVXWXGcrOuJqktJELbtuEtloyiru2PhdbqhKiq Fs8r+YficDonr6thZ+/JCDTJcpNTLDsdhifbtPTY7joSC8RhZyYZzoJJW4tVOjl4//Xe 05d7saPWIHtcYPQgJJZN0F1WETDtJp9bD2SsCG5tzmHdP5t3dkLWOUbs8jB6ZcZRG0N8 3HpPOu/wt+Dpm3alshWKIasUgoTb9Or5Vg/+AxAsfZ0D5jDFt9yIhpPkohj7l6+7C/v0 IF0bOTpcS6QM7OQN/ibWUboU3nzFHBBqvqEHKiYVH0Mgokf2j8H9BEmylASBnLQkea8R 6P8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=A1FVtvt8JaGY+Zkvo43+9f64QVvd3yxPikd3l402PXA=; b=BqTkj/fERqvj52d/Q9wWLmO42+oiuZJtri9p86PqyWbO/kvPg8LNzcR9jQ71X7BTai ig8/YQY0TDS0NMw059vXr0sr0ITr2RrU2Gz/ADpEds/PpnQZx2FZOSkZ+B9oQ9cxSrtt QwISqcHHpogKDtmojR4SqxnDMXsHUlq6aWspbfQsoC76gmwhvB1bRn9voPqXUz1ImrwZ EzgN95nrGnaEyc6yMtkK2oB5XJvzNgMrhhOx+td8pHKNOotIFRNoEJBEAG7FaniiX5DK 9zgXZ0bg2eVFfayGhaHrYLjKTBHpXnjgF2kOvsrjdmKQ3QwZwYCzjhMBCG+3SIYjMXia BAYQ== X-Gm-Message-State: AE9vXwOvbma7tNrwiAoZB/s6+SqYJBb+30oJt6/inUsEk0xUnu0tMbRsgfA7V3k8ESELpA== X-Received: by 10.36.94.195 with SMTP id h186mr11790143itb.24.1472929949938; Sat, 03 Sep 2016 12:12:29 -0700 (PDT) Original-Received: from zony ([45.2.7.130]) by smtp.googlemail.com with ESMTPSA id w132sm4941866ita.5.2016.09.03.12.12.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Sep 2016 12:12:29 -0700 (PDT) In-Reply-To: <83twdwdd0l.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 03 Sep 2016 22:00:42 +0300") 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:122909 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> >> 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. >> >> (file-ex (expand-file-name file))) >> - (when (file-exists-p file-ex) >> + (when (and file-ex (file-regular-p file-ex)) > > 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? Indeed, not required. It's just leftover confusion. --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=v4-0001-Don-t-load-directories.patch Content-Description: patch v4 >From 72ac37f50068af39aebc200b812cb901e0dcd176 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 21 Aug 2016 10:51:38 -0400 Subject: [PATCH v4] 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..d5225bd 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 (file-regular-p file-ex) (setq file file-ex)) (load file nil t))) -- 2.9.3 --=-=-=--