01/01: gnu: emacs: Delete the subdirs.el file under the site-lisp directory.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit a7a492899adac5047e4b11c77edd881ac1276c37
Author: Maxim Cournoyer <address@hidden>
Date:   Mon Dec 9 12:45:00 2019 +0900

    gnu: emacs: Delete the subdirs.el file under the site-lisp directory.
    
    This fixes bug #38533 (see: https://bugs.gnu.org/38533).
    
    * gnu/packages/emacs.scm (emacs)[phases]{install-site-start}: Delete the
    subdirs.el file.
    
    Reported-by:  Diego Nicola Barbato <address@hidden>
---
 gnu/packages/emacs.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ca5a7b9..eba7f88 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)