From: npostavs@users.sourceforge.net
To: Glenn Morris <rgm@gnu.org>
Cc: 16406@debbugs.gnu.org
Subject: bug#16406: load prefers directories rather than searching load-path
Date: Sat, 03 Sep 2016 12:43:29 -0400 [thread overview]
Message-ID: <878tv9ndce.fsf@users.sourceforge.net> (raw)
In-Reply-To: <8737lyulkl.fsf@users.sourceforge.net> (npostavs@users.sourceforge.net's message of "Sun, 21 Aug 2016 12:35:22 -0400")
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
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.
[-- Attachment #2: patch v2 --]
[-- Type: text/plain, Size: 1429 bytes --]
From 38e48fb4bc3b6f949659d528fcaaa78d903be1db Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
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
next prev parent reply other threads:[~2016-09-03 16:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-10 5:23 bug#16406: load prefers directories rather than searching load-path Glenn Morris
2014-01-10 14:46 ` Stefan Monnier
2016-08-21 16:35 ` npostavs
2016-09-03 16:43 ` npostavs [this message]
2016-09-03 17:32 ` Eli Zaretskii
2016-09-03 18:43 ` npostavs
2016-09-03 19:00 ` Eli Zaretskii
2016-09-03 19:12 ` npostavs
2016-09-03 19:27 ` Eli Zaretskii
2016-09-07 23:27 ` npostavs
2016-09-04 22:06 ` bug#17848: #17848 add suffix search to -l even when directory part in argument (WAS: Re: bug#16406: load prefers directories...) npostavs
2016-09-05 15:07 ` Eli Zaretskii
2016-09-05 22:59 ` bug#17848: #17848 add suffix search to -l even when directory part in argument npostavs
2016-09-06 15:05 ` Eli Zaretskii
2016-09-08 0:06 ` npostavs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878tv9ndce.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=16406@debbugs.gnu.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).