aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/emacs.scm
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2017-02-18 11:44:52 +0300
committerAlex Kost <alezost@gmail.com>2017-02-27 16:44:58 +0300
commit9bd94544be43b7d028e1aaeb4069b07bdb24610f (patch)
tree3d84d8d5aedeb3de44b81227911fa9a12506e609 /gnu/packages/emacs.scm
parent59d04f63dfe8b68906e4cccc60ca27cbd546db78 (diff)
downloadguix-9bd94544be43b7d028e1aaeb4069b07bdb24610f.tar
guix-9bd94544be43b7d028e1aaeb4069b07bdb24610f.tar.gz
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'.
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r--gnu/packages/emacs.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3e722c326b..ca3b832dc0 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)