From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ePFgCDrcbl8nQAAA0tVLHw (envelope-from ) for ; Sat, 26 Sep 2020 06:14:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sCcpBDrcbl8bDgAAB5/wlQ (envelope-from ) for ; Sat, 26 Sep 2020 06:14:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B7BDB9404D0 for ; Sat, 26 Sep 2020 06:14:17 +0000 (UTC) Received: from localhost ([::1]:35710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kM3TL-0007A7-U1 for larch@yhetil.org; Sat, 26 Sep 2020 02:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kM3T9-0006xb-Fx for guix-patches@gnu.org; Sat, 26 Sep 2020 02:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kM3T9-0005pA-5Y for guix-patches@gnu.org; Sat, 26 Sep 2020 02:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kM3T9-0005il-1b for guix-patches@gnu.org; Sat, 26 Sep 2020 02:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43627] [PATCH core-updates 3/3] Revert "emacs-build-system: Ensure the core libraries appear last in the load path." Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 06:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43627@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 43627-submit@debbugs.gnu.org id=B43627.160110082921947 (code B ref 43627); Sat, 26 Sep 2020 06:14:03 +0000 Received: (at 43627) by debbugs.gnu.org; 26 Sep 2020 06:13:49 +0000 Received: from localhost ([127.0.0.1]:45656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM3Su-0005hv-Ur for submit@debbugs.gnu.org; Sat, 26 Sep 2020 02:13:49 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:38078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM3Sr-0005hX-Jn for 43627@debbugs.gnu.org; Sat, 26 Sep 2020 02:13:47 -0400 Received: by mail-qk1-f194.google.com with SMTP id d20so5350399qka.5 for <43627@debbugs.gnu.org>; Fri, 25 Sep 2020 23:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uDjDGN/oXrDutdNgUeiPWkt5dpiLqnEJlTYz5N1V6vA=; b=GQSIjnp7U8nZaPqKYqagC6SGCKAqPWMH2HyCnodp3oXqNChU/bx45IT5EWP/6qJijR VhiizvORoqjbemgqVWZhrOmpCSIiY95u+5Far23qASfxHBlTGvs2YyBmFUMEK7gFaQsh Wn+BsO+x2CK0p7VN+RUJzsgJS6tSlw2cING9SXbW/Q29qEUl5sA39str2UasWrxfX+bz 57kNF2LsI6jjgkaqgZujPvWnM6pIHi3FOxafCVdgdLGt8GiGQfIMESKyvmr0pkeIBqhG NVhtfUST90Lf7wYEouApW7cxmVKIdQsipLe+QO1Y5RDz0jC3lynM44oG0mtt7bocW3m0 eKCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uDjDGN/oXrDutdNgUeiPWkt5dpiLqnEJlTYz5N1V6vA=; b=AidoCxZK4ExMOo1pnvbS0upXlIbxYMuRYXagK7QmUWDVzeFRLQKvj4h2ENJJ5w6YxC eQl1j8jM+6eynO2XvuP573X6phKtKZusqRGQPdhQSsIJlcFy66Eg8pzJPiJ7rKdcDEvx IaSrImENAMcnBtoCpEh/tn85e8bHnk9cEOP8qd3SLWqkaLSERc8fua358t0tuJ5RtecE K59Ppk7lK6OvHWvmdM3B8otZAo1Ukswuo4wrZx1Bk3T0g8ViuOU/+S0th7wtMrtRX+aw uxaxEifQMroMFrA40rTSTU4qd+gqFphGclrUSf5ikWmyRG1MHVbokSH52vJccM+HTEcV 4TaA== X-Gm-Message-State: AOAM531fgj05ozlG9Sp9kv0HNd+Rjyf8UQfJd1YM1sU1pEaxq4AcNirP 0r77NNJIbkMDgcPI3PTXpXwGZr6xc80= X-Google-Smtp-Source: ABdhPJyI1l3Rm3L3qs246+n++P+4t4bExVJEfB19sMSYzXwEGknHhwrogGei5Rjdx50qsKkYRKgSWw== X-Received: by 2002:a05:620a:238:: with SMTP id u24mr3358520qkm.115.1601100820080; Fri, 25 Sep 2020 23:13:40 -0700 (PDT) Received: from localhost.localdomain (dsl-10-132-92.b2b2c.ca. [72.10.132.92]) by smtp.gmail.com with ESMTPSA id k20sm3724091qtm.44.2020.09.25.23.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 23:13:39 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 26 Sep 2020 02:14:14 -0400 Message-Id: <20200926061414.7898-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926061414.7898-1-maxim.cournoyer@gmail.com> References: <20200926061414.7898-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=GQSIjnp7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 4.09 X-TUID: 5Bb8mEJZGOfT 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