summary refs log tree commit diff
path: root/emacs.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-09-13 21:28:01 +0200
committerLudovic Courtès <ludo@gnu.org>2015-09-13 21:28:01 +0200
commit75710da66710cef1d32053cd8f350d13057d02a7 (patch)
treeabef6a326c741b1eb18db866b2f2bacee3e5fc51 /emacs.am
parentab20c2cc33063ce783515d8ae7899ec7e2ca6f96 (diff)
parent610075f7c94c80b8321887b7ccf8bb1a7edd2b8e (diff)
downloadguix-75710da66710cef1d32053cd8f350d13057d02a7.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'emacs.am')
-rw-r--r--emacs.am13
1 files changed, 9 insertions, 4 deletions
diff --git a/emacs.am b/emacs.am
index 372b33e822..5d3cb81257 100644
--- a/emacs.am
+++ b/emacs.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2014 Alex Kost <alezost@gmail.com>
+# Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -21,13 +21,20 @@ AUTOLOADS = emacs/guix-autoloads.el
 ELFILES =					\
   emacs/guix-backend.el				\
   emacs/guix-base.el				\
+  emacs/guix-command.el				\
   emacs/guix-emacs.el				\
+  emacs/guix-external.el			\
+  emacs/guix-help-vars.el			\
   emacs/guix-history.el				\
   emacs/guix-info.el				\
+  emacs/guix-init.el				\
   emacs/guix-list.el				\
   emacs/guix-messages.el			\
   emacs/guix-pcomplete.el			\
+  emacs/guix-popup.el				\
   emacs/guix-prettify.el			\
+  emacs/guix-profiles.el			\
+  emacs/guix-read.el				\
   emacs/guix-utils.el				\
   emacs/guix.el
 
@@ -37,9 +44,7 @@ dist_lisp_DATA =				\
   $(ELFILES)					\
   $(AUTOLOADS)
 
-nodist_lisp_DATA =				\
-  emacs/guix-init.el				\
-  emacs/guix-profiles.el
+nodist_lisp_DATA = emacs/guix-config.el
 
 $(AUTOLOADS): $(ELFILES)
 	$(EMACS) --batch --eval						\