diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-12-12 04:10:59 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-12-12 04:10:59 +0200 |
| commit | c9e676d0b141f510c19e26edb1e6fad079b9b502 (patch) | |
| tree | 79abb4a4b92ecf4504a46e55ffa7971a06c8a5df /gnu/packages/emacs.scm | |
| parent | d45720d8b456e82380601d77e25bd05c6e0dc36a (diff) | |
| parent | dcb7ce500bd025455982d74c3384c707f35bbb46 (diff) | |
| download | guix-c9e676d0b141f510c19e26edb1e6fad079b9b502.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 95859b8a88..eba7f88551 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -143,6 +143,11 @@ (display (string-append "(when (require 'guix-emacs nil t)\n" " (guix-emacs-autoload-packages))\n")))) + ;; Remove the extraneous subdirs.el file, as it causes Emacs to + ;; add recursively all the the sub-directories of a profile's + ;; share/emacs/site-lisp union when added to EMACSLOADPATH, + ;; which leads to conflicts. + (delete-file (string-append lisp-dir "/subdirs.el")) #t)))))) (inputs `(("gnutls" ,gnutls) @@ -187,8 +192,8 @@ (list (search-path-specification (variable "EMACSLOADPATH") ;; The versioned entry is for the Emacs' builtin libraries. - (files (list (string-append "share/emacs/" version "/lisp") - "share/emacs/site-lisp"))) + (files (list "share/emacs/site-lisp" + (string-append "share/emacs/" version "/lisp")))) (search-path-specification (variable "INFOPATH") (files '("share/info"))))) |