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 12:43:29 -0400 Message-ID: <878tv9ndce.fsf@users.sourceforge.net> References: <8737lyulkl.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1472921069 25695 195.159.176.226 (3 Sep 2016 16:44:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 3 Sep 2016 16:44:29 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: 16406@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Sep 03 18:44:25 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 1bgE3D-00055t-9a for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Sep 2016 18:44:15 +0200 Original-Received: from localhost ([::1]:47129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgE3B-00060N-1Z for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Sep 2016 12:44:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgE36-0005zP-3N for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 12:44:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgE30-0007pi-6b for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 12:44:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgE30-0007pd-3a for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 12:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bgE2z-0004Wq-Nk for bug-gnu-emacs@gnu.org; Sat, 03 Sep 2016 12:44:01 -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 16:44:01 +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.147292099717342 (code B ref 16406); Sat, 03 Sep 2016 16:44:01 +0000 Original-Received: (at 16406) by debbugs.gnu.org; 3 Sep 2016 16:43:17 +0000 Original-Received: from localhost ([127.0.0.1]:48861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgE2G-0004Ve-Q1 for submit@debbugs.gnu.org; Sat, 03 Sep 2016 12:43:16 -0400 Original-Received: from mail-it0-f44.google.com ([209.85.214.44]:35536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgE2F-0004VR-GK for 16406@debbugs.gnu.org; Sat, 03 Sep 2016 12:43:15 -0400 Original-Received: by mail-it0-f44.google.com with SMTP id e124so88652966ith.0 for <16406@debbugs.gnu.org>; Sat, 03 Sep 2016 09:43:15 -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=ZUGFFZTpiSPHx7SLKWocGqUmBzljnb5TLh11Hi7Dyvc=; b=DMeLyNU+6pkH3siPGjg017kN1/fNIRFkzyb3dFhubGwCOTk3yq86fKX9bkMIkhHa79 sqyoxqATpw9nPUHh8zC0K0csIh3SnC9tpyx26sGxblfRgA720tMocfe56Q8KyyiBcB57 urggsIXNW9WMA9CjZkuZXzSjPpa8+LDauTSidRGXh2PQ1L7FVxndq5qmi+D3e57nE/ho ZzEiMSbazdHcWRPgskdEtBCXUXvjIpXXqlglMGCpG7TqTrDfZAIZfWW8P3sIpaBnwnTB jhe8z+ba4KfCZby+Ocu+w8U4ks1KhJQ3I1EVSVL+pu+5RdTpBMPj8uSj5zmgLz3156sV SKaw== 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=ZUGFFZTpiSPHx7SLKWocGqUmBzljnb5TLh11Hi7Dyvc=; b=acjua7j+MxjVtGYbzuWQZZ1oKM11rq5O2t+sm+QFsqXmCNlR+53TB8kygSrLwKG7TZ 4Tm5T0nEqMXOjhCv6eCMYsewKRIBMtnqO2vV8J3SmxvucEHW7UK2ZO4YK5bM4BAaI69m nDZntjZ9pvkI78dOpz/nn2MHW0Zk3LLK/m6PUxIEqpT/OWEros1whDnPjyu9fXnFhpp+ HS9jUC+fj/TiMyvfW4sMxpmevaIYCzACq6qTZnGCpeN/9gdxDey7tTapVI0EyCoCFiVI 0QgTEB7O2umwzDtv7kfDN20THRykLv7kj4fRzaqEHA/gwOh6hDQJHLM8lZSzhvOdT4Dz sr8Q== X-Gm-Message-State: AE9vXwNtCtBuoTp9LsWwxFS+IGPUJozblVx+fJoOrYZIR19H9y8b+eRb1zQMkHn5ds4dbQ== X-Received: by 10.36.71.73 with SMTP id t70mr12387025itb.47.1472920989735; Sat, 03 Sep 2016 09:43:09 -0700 (PDT) Original-Received: from zony ([45.2.7.130]) by smtp.googlemail.com with ESMTPSA id z125sm1684803itc.0.2016.09.03.09.43.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Sep 2016 09:43:09 -0700 (PDT) In-Reply-To: <8737lyulkl.fsf@users.sourceforge.net> (npostavs@users.sourceforge.net's message of "Sun, 21 Aug 2016 12:35:22 -0400") 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:122888 Archived-At: --=-=-= Content-Type: text/plain npostavs@users.sourceforge.net writes: > > Seems simple enough to fix, here is a patch (this also covers #17848 > "add suffix search to -l even when directory part in argument"): That one broke normal loading. Here's a new patch. --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=v2-0001-Improvements-to-load-argument-handling.patch Content-Description: patch v2 >From 38e48fb4bc3b6f949659d528fcaaa78d903be1db Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 21 Aug 2016 10:51:38 -0400 Subject: [PATCH v2] Improvements to --load argument handling * lisp/startup.el (command-line-1): Search for files with load-suffixes in default dir (Bug #17848). Only pass normal files that were found, since `load' doesn't handle directories (Bug #16406). --- lisp/startup.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index fcdc376..01e6d85 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2392,8 +2392,11 @@ command-line-1 (or argval (pop command-line-args-left)))) ;; 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) + (file-ex (locate-file + file (list default-directory) + (append (get-load-suffixes) + load-file-rep-suffixes)))) + (when (and file-ex (file-regular-p file-ex)) (setq file file-ex)) (load file nil t))) -- 2.9.3 --=-=-=--