From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 43627@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#43627] [PATCH core-updates 3/3] Revert "emacs-build-system: Ensure the core libraries appear last in the load path."
Date: Sat, 26 Sep 2020 02:14:14 -0400 [thread overview]
Message-ID: <20200926061414.7898-3-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20200926061414.7898-1-maxim.cournoyer@gmail.com>
This reverts commit e34e02707d6bd38c79ce7bec776fcdc528548a0d. This hack is no
longer necessary, now that search path specifications allows specifying that a
trailing separator should be appended, which for Emacs stands for the location
of the builtin Elisp libraries.
---
guix/build/emacs-build-system.scm | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index 26ea59bc25..227434d904 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -76,18 +76,8 @@ archive, a directory, or an Emacs Lisp file."
(define* (add-source-to-load-path #:key dummy #:allow-other-keys)
"Augment the EMACSLOADPATH environment variable with the source directory."
(let* ((source-directory (getcwd))
- (emacs-load-path (string-split (getenv "EMACSLOADPATH") #\:))
- ;; XXX: Make sure the Emacs core libraries appear at the end of
- ;; EMACSLOADPATH, to avoid shadowing any other libraries depended
- ;; upon.
- (emacs-load-path-non-core (filter (cut string-contains <>
- "/share/emacs/site-lisp")
- emacs-load-path))
- (emacs-load-path-value (string-append
- (string-join (cons source-directory
- emacs-load-path-non-core)
- ":")
- ":")))
+ (emacs-load-path-value (string-append source-directory ":"
+ (getenv "EMACSLOADPATH"))))
(setenv "EMACSLOADPATH" emacs-load-path-value)
(format #t "source directory ~s prepended to the `EMACSLOADPATH' \
environment variable\n" source-directory)))
--
2.28.0
next prev parent reply other threads:[~2020-09-26 6:14 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-26 6:11 [bug#43627] [PATCH core-updates]: Add a 'append-separator?' field to the <search-path-specification> record Maxim Cournoyer
2020-09-26 6:14 ` [bug#43627] [PATCH core-updates 1/3] guix: Add an append-separator? " Maxim Cournoyer
2020-09-26 6:14 ` [bug#43627] [PATCH core-updates 2/3] gnu: emacs: Use the new append-separator? option to define its search path Maxim Cournoyer
2020-09-26 6:14 ` Maxim Cournoyer [this message]
2020-09-27 19:01 ` [bug#43627] [PATCH core-updates]: Add a 'append-separator?' field to the <search-path-specification> record Ludovic Courtès
2020-10-03 21:22 ` Maxim Cournoyer
2020-11-02 13:59 ` Ludovic Courtès
2020-11-08 5:49 ` Maxim Cournoyer
2021-03-30 15:51 ` [bug#43627] [PATCH core-updates v2 1/2] guix: Add an append-separator? " Maxim Cournoyer
2021-03-30 15:51 ` [bug#43627] [PATCH core-updates v2 2/2] gnu: emacs: Use the new append-separator? option to define its search path Maxim Cournoyer
2021-04-10 20:42 ` [bug#43627] [PATCH core-updates v2 1/2] guix: Add an append-separator? field to the <search-path-specification> record Ludovic Courtès
2021-05-20 14:24 ` bug#43627: " Maxim Cournoyer
2021-03-30 18:41 ` [bug#43627] [PATCH] gnu: emacs: Wrap EMACSLOADPATH Leo Prikler
2021-04-04 4:35 ` bug#47458: Terrible UX upgrading Emacs in Guix Maxim Cournoyer
2021-04-04 7:49 ` Leo Prikler
2021-04-06 12:09 ` Maxim Cournoyer
2021-04-06 15:49 ` Leo Prikler
2021-04-07 19:46 ` Maxim Cournoyer
2021-05-20 13:24 ` Maxim Cournoyer
-- strict thread matches above, loose matches on Subject: below --
2021-03-29 2:02 Mark H Weaver
2021-03-29 8:07 ` Leo Prikler
2021-03-29 8:24 ` Maxime Devos
2021-03-29 8:43 ` Leo Prikler
2021-03-29 15:55 ` [bug#45359] " Ludovic Courtès
2021-03-29 15:55 ` Ludovic Courtès
2021-03-29 18:25 ` bug#45359: " Maxim Cournoyer
2020-12-22 3:28 ` [bug#45359] [PATCH]: Re-introduce Emacs packages specific installation prefix Maxim Cournoyer
2020-12-22 8:51 ` bug#45316: " Leo Prikler
2020-12-22 18:09 ` Maxim Cournoyer
2020-12-22 19:10 ` Leo Prikler
2020-12-26 5:01 ` Maxim Cournoyer
2020-12-26 10:56 ` Leo Prikler
2020-12-27 4:44 ` Maxim Cournoyer
2020-12-27 8:46 ` Leo Prikler
[not found] ` <handler.45359.D45359.161704236132600.notifdone@debbugs.gnu.org>
2021-03-29 18:45 ` [bug#45359] closed (Re: bug#47458: Terrible UX upgrading Emacs in Guix) Maxim Cournoyer
2021-03-29 18:48 ` bug#45359: [PATCH]: Re-introduce Emacs packages specific installation prefix Maxim Cournoyer
2021-03-30 8:04 ` [bug#45359] bug#47458: Terrible UX upgrading Emacs in Guix Ludovic Courtès
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200926061414.7898-3-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=43627@debbugs.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.