diff options
| author | Brett Gilio <brettg@posteo.net> | 2019-12-13 07:57:51 -0600 |
|---|---|---|
| committer | Brett Gilio <brettg@posteo.net> | 2019-12-13 07:58:30 -0600 |
| commit | 94c7f70faa0ba0409099b423df6534718d7518cc (patch) | |
| tree | 97586676534c56491725c0ed9e6299e89888fde6 /guix/build/emacs-build-system.scm | |
| parent | 7711db7f4ec24015d7c2412ef1e624cbf8110ed3 (diff) | |
| parent | 19ba75dc02c4ff072f96296543a00737bcf24bf9 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/build/emacs-build-system.scm')
| -rw-r--r-- | guix/build/emacs-build-system.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 52c1ea177e..09de244993 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -76,8 +76,18 @@ 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-value (string-append source-directory ":" - (getenv "EMACSLOADPATH")))) + (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) + ":") + ":"))) (setenv "EMACSLOADPATH" emacs-load-path-value) (format #t "source directory ~s prepended to the `EMACSLOADPATH' \ environment variable\n" source-directory))) |