From 9bd94544be43b7d028e1aaeb4069b07bdb24610f Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sat, 18 Feb 2017 11:44:52 +0300 Subject: gnu: emacs: Simplify "guix-emacs.el". * gnu/packages/aux-files/emacs/guix-emacs.el: Do not try to require 'guix-profiles'. Do not call 'guix-emacs-autoload-packages' in the top level. (guix-package-enable-at-startup): Remove. This variable can't be set by a user since this file is loaded before user config. (guix-emacs-autoload-packages): Use 'guix-read-package-profile' instead of 'guix-profile-prompt' in interactive clause (it was renamed in Emacs-Guix). * gnu/packages/emacs.scm (emacs)[arguments]: Call 'guix-emacs-autoload-packages' in "site-start.el" after requiring 'guix-emacs'. --- gnu/packages/aux-files/emacs/guix-emacs.el | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'gnu/packages/aux-files') diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index 099261a013..2bbd639ffd 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -1,6 +1,6 @@ ;;; guix-emacs.el --- Emacs packages installed with Guix -;; Copyright © 2014, 2015, 2016 Alex Kost +;; Copyright © 2014, 2015, 2016, 2017 Alex Kost ;; This file is part of GNU Guix. @@ -19,22 +19,14 @@ ;;; Commentary: -;; This file provides auxiliary code for working with Emacs packages +;; This file provides auxiliary code to autoload Emacs packages ;; installed with Guix. ;;; Code: (require 'cl-lib) -(unless (require 'guix-profiles nil t) - (defvar guix-user-profile (expand-file-name "~/.guix-profile"))) -(defcustom guix-package-enable-at-startup t - "If non-nil, activate Emacs packages installed in a user profile. -Set this variable to nil before requiring `guix-emacs' file to -avoid loading autoloads of Emacs packages installed in -`guix-user-profile'." - :type 'boolean - :group 'guix) +(defvar guix-user-profile (expand-file-name "~/.guix-profile")) (defvar guix-emacs-autoloads nil "List of the last loaded Emacs autoloads.") @@ -92,8 +84,8 @@ profiles. 'Autoload' means add directories with Emacs packages to `load-path' and load 'autoloads' files matching `guix-emacs-autoloads-regexp'." - (interactive (list (if (fboundp 'guix-profile-prompt) - (funcall 'guix-profile-prompt) + (interactive (list (if (fboundp 'guix-read-package-profile) + (funcall 'guix-read-package-profile) guix-user-profile))) (let ((profiles (or profiles (list "/run/current-system/profile" @@ -115,9 +107,6 @@ profiles. (setq guix-emacs-autoloads (append new-autoloads guix-emacs-autoloads)))))))) -(when guix-package-enable-at-startup - (guix-emacs-autoload-packages)) - (provide 'guix-emacs) ;;; guix-emacs.el ends here -- cgit v1.2.3