From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 4/5] gnu: emacs: Simplify "guix-emacs.el".
Date: Sat, 18 Feb 2017 12:21:44 +0300 [thread overview]
Message-ID: <20170218092145.28459-5-alezost@gmail.com> (raw)
In-Reply-To: <20170218092145.28459-1-alezost@gmail.com>
* 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 +++++----------------
gnu/packages/emacs.scm | 4 +++-
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el
index 099261a..2bbd639 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 <alezost@gmail.com>
+;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
;; 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
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 51a579a..94ca52a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -144,7 +144,9 @@
(string-append lisp-dir "/guix-emacs.el"))
(with-output-to-file (string-append lisp-dir "/site-start.el")
(lambda ()
- (display "(require 'guix-emacs nil t)")))
+ (display
+ (string-append "(when (require 'guix-emacs nil t)\n"
+ " (guix-emacs-autoload-packages))\n"))))
#t))))))
(inputs
`(("gnutls" ,gnutls)
--
2.10.2
next prev parent reply other threads:[~2017-02-18 9:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-18 9:21 [PATCH 0/5] gnu/packages/aux-files Alex Kost
2017-02-18 9:21 ` [PATCH 1/5] packages: Add 'search-auxiliary-file' Alex Kost
2017-02-18 9:21 ` [PATCH 2/5] gnu: linux: Move configuration files to "aux-files" Alex Kost
2017-02-18 9:21 ` [PATCH 3/5] gnu: emacs: Move "guix-emacs.el" " Alex Kost
2017-02-18 9:21 ` Alex Kost [this message]
2017-02-18 9:21 ` [PATCH 5/5] .gitignore: Remove stale entries Alex Kost
2017-02-27 13:46 ` [PATCH 0/5] gnu/packages/aux-files Alex Kost
2017-02-27 15:07 ` Ricardo Wurmus
2017-02-28 14:01 ` Alex Kost
2017-03-06 15:50 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170218092145.28459-5-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.