[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: emacs: Find autoloads in "guix.d" subdirectories.

From: Alex Kost
Subject: 01/01: emacs: Find autoloads in "guix.d" subdirectories.
Date: Sat, 11 Jul 2015 15:23:40 +0000

alezost pushed a commit to branch master
in repository guix.

commit 7741139080a6b00aa4f1846fe7668859e91bec58
Author: Alex Kost <address@hidden>
Date:   Fri Jun 19 12:31:59 2015 +0300

    emacs: Find autoloads in "guix.d" subdirectories.
    Co-authored-by: Federico Beffa <address@hidden>.
    * emacs/guix-emacs.el (guix-emacs-find-autoloads-in-directory,
      guix-emacs-subdirs): New functions.
      (guix-emacs-find-autoloads): Search for autoloads in "guix.d"
      (guix-emacs-load-autoloads): Add subdirectories to 'load-path'.
    * emacs/ Do not add guix emacs directory to 'load-path'
      because it will be done by 'guix-emacs-load-autoloads'.  Move
      requiring 'guix-emacs' from the top-level to a clause for checking for
 emacs/guix-emacs.el   |   29 ++++++++++++++++++++++++++---
 emacs/ |    4 +---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/emacs/guix-emacs.el b/emacs/guix-emacs.el
index 512a2e2..4c3aa23 100644
--- a/emacs/guix-emacs.el
+++ b/emacs/guix-emacs.el
@@ -42,19 +42,40 @@ If PROFILE is nil, use `guix-user-profile'."
   (expand-file-name "share/emacs/site-lisp"
                     (or profile guix-user-profile)))
+(defun guix-emacs-find-autoloads-in-directory (directory)
+  "Return list of Emacs 'autoloads' files in DIRECTORY."
+  (directory-files directory 'full-name "-autoloads\\.el\\'" 'no-sort))
+(defun guix-emacs-subdirs (directory)
+  "Return list of DIRECTORY subdirectories."
+  (cl-remove-if (lambda (file)
+                  (or (string-match-p (rx "/." string-end) file)
+                      (string-match-p (rx "/.." string-end) file)
+                      (not (file-directory-p file))))
+                (directory-files directory 'full-name nil 'no-sort)))
 (defun guix-emacs-find-autoloads (&optional profile)
   "Return list of autoloads of Emacs packages installed in PROFILE.
 If PROFILE is nil, use `guix-user-profile'.
 Return nil if there are no emacs packages installed in PROFILE."
-  (let ((dir (guix-emacs-directory profile)))
-    (if (file-directory-p dir)
-        (directory-files dir 'full-name "-autoloads\\.el\\'")
+  (let ((elisp-root-dir (guix-emacs-directory profile)))
+    (if (file-directory-p elisp-root-dir)
+        (let ((elisp-pkgs-dir (expand-file-name "guix.d" elisp-root-dir))
+              (root-autoloads (guix-emacs-find-autoloads-in-directory
+                               elisp-root-dir)))
+          (if (file-directory-p elisp-pkgs-dir)
+              (let ((pkgs-autoloads
+                     (cl-mapcan #'guix-emacs-find-autoloads-in-directory
+                                (guix-emacs-subdirs elisp-pkgs-dir))))
+                (append root-autoloads pkgs-autoloads))
+            root-autoloads))
       (message "Directory '%s' does not exist." dir)
 (defun guix-emacs-load-autoloads (&optional all)
   "Load autoloads for Emacs packages installed in a user profile.
+Add autoloads directories to `load-path'.
 If ALL is nil, activate only those packages that were installed
 after the last activation, otherwise activate all Emacs packages
 installed in `guix-user-profile'."
@@ -65,6 +86,8 @@ installed in `guix-user-profile'."
                   (cl-nset-difference autoloads guix-emacs-autoloads
                                       :test #'string=))))
     (dolist (file files)
+      (cl-pushnew (file-name-directory file) load-path
+                  :test #'string=)
       (load file 'noerror))
     (setq guix-emacs-autoloads autoloads)))
diff --git a/emacs/ b/emacs/
index 4e40d71..728bc37 100644
--- a/emacs/
+++ b/emacs/
@@ -1,5 +1,4 @@
 (require 'guix-autoloads)
-(require 'guix-emacs)
 (defvar guix-load-path
   (replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@")
@@ -13,9 +12,8 @@ avoid loading autoloads of Emacs packages installed in
   :type 'boolean
   :group 'guix)
-(add-to-list 'load-path (guix-emacs-directory))
 (when guix-package-enable-at-startup
+  (require 'guix-emacs)
   (guix-emacs-load-autoloads 'all))
 (provide 'guix-init)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]