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#17848: #17848 add suffix search to -l even when directory part in argument (WAS: Re: bug#16406: load prefers directories...) Date: Sun, 04 Sep 2016 18:06:52 -0400 Message-ID: <8760qb9v5v.fsf_-_@users.sourceforge.net> References: <8737lyulkl.fsf@users.sourceforge.net> <878tv9ndce.fsf@users.sourceforge.net> <831t10evoh.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1473026844 32363 195.159.176.226 (4 Sep 2016 22:07:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 4 Sep 2016 22:07:24 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: 17848@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 05 00:07:20 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 1bgfZL-0007Uv-Sj for geb-bug-gnu-emacs@m.gmane.org; Mon, 05 Sep 2016 00:07:16 +0200 Original-Received: from localhost ([::1]:51163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgfZJ-0007yK-Es for geb-bug-gnu-emacs@m.gmane.org; Sun, 04 Sep 2016 18:07:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgfZD-0007wh-2M for bug-gnu-emacs@gnu.org; Sun, 04 Sep 2016 18:07:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgfZ8-0004Db-0Q for bug-gnu-emacs@gnu.org; Sun, 04 Sep 2016 18:07:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:52233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgfZ7-0004DN-Sq for bug-gnu-emacs@gnu.org; Sun, 04 Sep 2016 18:07:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bgfZ7-0007xL-Ke for bug-gnu-emacs@gnu.org; Sun, 04 Sep 2016 18:07: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: Sun, 04 Sep 2016 22:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17848 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17848-submit@debbugs.gnu.org id=B17848.147302680030554 (code B ref 17848); Sun, 04 Sep 2016 22:07:01 +0000 Original-Received: (at 17848) by debbugs.gnu.org; 4 Sep 2016 22:06:40 +0000 Original-Received: from localhost ([127.0.0.1]:49945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgfYm-0007wf-21 for submit@debbugs.gnu.org; Sun, 04 Sep 2016 18:06:40 -0400 Original-Received: from mail-it0-f47.google.com ([209.85.214.47]:36510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgfYj-0007wN-KJ; Sun, 04 Sep 2016 18:06:38 -0400 Original-Received: by mail-it0-f47.google.com with SMTP id i184so121502882itf.1; Sun, 04 Sep 2016 15:06:37 -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=S4EipIC5CvoCK8etJM6Lv/h8Wd1uUm4UCPU8AZknOR4=; b=HpDBPZnQuK4wYrJ8CYcK6yuTjfTe/vHHz8rOjk3sQ/BJMlH33TA5BOKDj+2eLdzfiJ HVMjWLBBYerRFizH5TkFjh6XNVFBTtmKp0fInzMyTMNSD9MW43TJd8odIwLfDX/ctUBS Fp62IXdgWpjUb+AfhPpFZLlYmDBdcd4V4I9liTnj/qU+HtTjUsFHwT8xLm5K2MYOEYuX xHkY5n+c/DQ1LltwqPvWbe9oX9YzN+9ugVKKNriDVhx5NjhZF8odBa5N4/IqlUT5K+Hz 0r7FhfNvQGFI/y0f5IQ4p96bx2GP5LC3p+nogaC1JQF3M2UIjC+8z2LbzkNbeiSghzWS vahQ== 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=S4EipIC5CvoCK8etJM6Lv/h8Wd1uUm4UCPU8AZknOR4=; b=jldnhUyVXN9UAx6CCrGYbczF6rU2+Apc3tNv//5jMb6qU5ytncFv1g/oInAja49ECX qObHELbIJFmq8AmWG4Njy6RCNSdFht3hRtyisQxNBS201EYocPurR87wBbnBjNIhs+Vh RXvAQdxX65G/0+csC5vR1OFYcxC1fnuEudE41NqpVGSf/MDkreKjSJzW+FPivAOfU1a8 L65MUGzbsop3KEK579otSXYZ8vSGko6OqpXhP6A4KeYB3y/JZl70KEyp/nu6DYQl/hgj zZzwsh1T8vLRVFvq0uufcgR3FTvKd4PBZajs/DiYmZ0DwfASaq5mKeqaYqe7zBRg92zJ RxPA== X-Gm-Message-State: AE9vXwMhsAh79PDdRt479dyo5jWTzgLqrknX3FBE2+xHBI+lWhd1Wd4aebwtTRTeLNEysw== X-Received: by 10.36.57.215 with SMTP id l206mr20244601ita.5.1473026792073; Sun, 04 Sep 2016 15:06:32 -0700 (PDT) Original-Received: from zony ([45.2.7.130]) by smtp.googlemail.com with ESMTPSA id k63sm4189093ith.16.2016.09.04.15.06.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 Sep 2016 15:06:31 -0700 (PDT) In-Reply-To: <831t10evoh.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 03 Sep 2016 20:32:14 +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:122943 Archived-At: --=-=-= Content-Type: text/plain tags 17848 patch quit Eli Zaretskii writes: > > Instead of doing the search by hand, wouldn't it be better to teach > 'load' to ignore directories? [...] > But I don't understand why using locate-file here is a good idea. So now in the context of *this* bug, I think `locate-file' is needed. The current directory needs to be searched for suffixed versions, but we can't let `load' do that without adding "." to `load-path'. --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=v1-0001-Add-suffix-search-to-load-dir-foo.patch Content-Description: patch >From b14d2df532f637fe9fe21a50a8a6066a40720c8b Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 4 Sep 2016 17:57:56 -0400 Subject: [PATCH v1] Add suffix search to --load dir/foo * lisp/startup.el (command-line-1): Search for files with load-suffixes in default directory (Bug #17848). --- lisp/startup.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index d5225bd..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-regular-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 --=-=-=--