From 3c8b5f63b2e34556463c22fa1565b46c1b31033c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 Nov 2019 14:02:42 +0900 Subject: [PATCH 4/6] gnu: emacs: Use load-path instead of EMACSLOADPATH. This enables the use of the subdirs.el feature of Emacs, where specifying a directory in EMACSLOADPATH translates into a `load-path' variable containing the directory and all its sub-directories. * gnu/packages/aux-files/emacs/guix-emacs.el (guix-emacs-autoload-packages): Use `load-path' directly instead of parsing EMACSLOADPATH. Reported-by: Leo Prikler --- gnu/packages/aux-files/emacs/guix-emacs.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index b4315c1a2e..05fc9709b6 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -47,13 +47,12 @@ The files in the list do not have extensions (.el, .elc)." ;; FIXME: The autoloads generated by the emacs-build-system are not byte ;; compiled. (interactive) - (let* ((emacs-load-path (getenv "EMACSLOADPATH")) - (emacs-non-core-load-path-directories + (let* ((emacs-non-core-load-path-directories ;; Filter out core Elisp directories, which are already autoloaded ;; by Emacs. (seq-filter (lambda (dir) (string-match-p "/share/emacs/site-lisp" dir)) - (split-string emacs-load-path ":"))) + load-path)) (autoloads (mapcan #'guix-emacs-find-autoloads emacs-non-core-load-path-directories))) (mapc (lambda (f) -- 2.24.0