From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 3/4] system: Fix EMACSLOADPATH. Date: Fri, 5 Feb 2016 15:13:46 +0300 Message-ID: <1454674427-6963-4-git-send-email-alezost@gmail.com> References: <1454674427-6963-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRfHS-0000aC-V2 for guix-devel@gnu.org; Fri, 05 Feb 2016 07:14:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRfHR-0003hV-QU for guix-devel@gnu.org; Fri, 05 Feb 2016 07:14:30 -0500 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:35310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRfHR-0003h1-JI for guix-devel@gnu.org; Fri, 05 Feb 2016 07:14:29 -0500 Received: by mail-lf0-x241.google.com with SMTP id j99so2775328lfi.2 for ; Fri, 05 Feb 2016 04:14:29 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id zk9sm2241314lbb.3.2016.02.05.04.14.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Feb 2016 04:14:28 -0800 (PST) In-Reply-To: <1454674427-6963-1-git-send-email-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org After commit 13fe4891fa247d306e203ee14c6886513bd86b52, Emacs package includes "site-start.el", and it has a priority over "/etc/emacs/site-start.el" on GuixSD because "/etc/emacs" is added to the end of 'load-path'. * gnu/system.scm (operating-system-environment-variables): Change EMACSLOADPATH to prepend "/etc/emacs" to 'load-path' instead of appending. --- gnu/system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index d4759a0..82dba7f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -581,8 +581,8 @@ use 'plain-file' instead~%") ("SSL_CERT_DIR" . "/etc/ssl/certs") ("SSL_CERT_FILE" . "/etc/ssl/certs/ca-certificates.crt") ("GIT_SSL_CAINFO" . "/etc/ssl/certs/ca-certificates.crt") - ;; Append the directory of 'site-start.el' to the search path. - ("EMACSLOADPATH" . ":/etc/emacs") + ;; Prepend the directory of 'site-start.el' to the search path. + ("EMACSLOADPATH" . "/etc/emacs:") ;; By default, applications that use D-Bus, such as Emacs, abort at startup ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. ("DBUS_FATAL_WARNINGS" . "0"))) -- 2.6.3