guix-commits
[Top][All Lists]
Advanced

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

01/05: emacs: init: Add "share/emacs/site-lisp" to 'load-path'.


From: Alex Kost
Subject: 01/05: emacs: init: Add "share/emacs/site-lisp" to 'load-path'.
Date: Fri, 16 Oct 2015 16:56:47 +0000

alezost pushed a commit to branch master
in repository guix.

commit b1b53df382deaeb849241f44581421704245483d
Author: Alex Kost <address@hidden>
Date:   Thu Oct 15 23:41:27 2015 +0300

    emacs: init: Add "share/emacs/site-lisp" to 'load-path'.
    
    Fixes a regression introduced in 7741139080a6b00aa4f1846fe7668859e91bec58.
    
    Reported by Ludovic Court├Ęs <address@hidden>.
    
    Not all emacs packages have "...-autoloads.el" files, so there is a
    chance that "~/.guix-profile/share/emacs/site-lisp" will not be added to
    'load-path', so add it unconditionally.
    
    * emacs/guix-init.el: Add guix emacs directory to 'load-path'.  Move
      requiring 'guix-emacs' to the top-level.
---
 emacs/guix-init.el |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 96aa0c2..4b3d9c2 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -1,4 +1,5 @@
 (require 'guix-autoloads)
+(require 'guix-emacs)
 
 (defcustom guix-package-enable-at-startup t
   "If non-nil, activate Emacs packages installed in a user profile.
@@ -8,8 +9,9 @@ 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))
 
 (add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)



reply via email to

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