aboutsummaryrefslogtreecommitdiff
path: root/emacs.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-12-14 11:55:07 +0100
committerLudovic Courtès <ludo@gnu.org>2014-12-14 11:55:07 +0100
commitc4a1b6c2ba479c6abcd22cab6a1fcd560469e986 (patch)
tree057fb773fcac4200ea66a0267a818be61cca3104 /emacs.am
parent2ed11b3a3e05549ed6ef8a604464f424c0eeae1c (diff)
parent45c5b47b96a238c764c2d32966267f7f897bcc3d (diff)
downloadpatches-c4a1b6c2ba479c6abcd22cab6a1fcd560469e986.tar
patches-c4a1b6c2ba479c6abcd22cab6a1fcd560469e986.tar.gz
Merge branch 'master' into 'core-updates'.
Diffstat (limited to 'emacs.am')
-rw-r--r--emacs.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/emacs.am b/emacs.am
index be7e77ecd8..a43168e2cf 100644
--- a/emacs.am
+++ b/emacs.am
@@ -21,6 +21,7 @@ AUTOLOADS = emacs/guix-autoloads.el
ELFILES = \
emacs/guix-backend.el \
emacs/guix-base.el \
+ emacs/guix-emacs.el \
emacs/guix-history.el \
emacs/guix-info.el \
emacs/guix-list.el \
@@ -36,7 +37,8 @@ dist_lisp_DATA = \
$(AUTOLOADS)
nodist_lisp_DATA = \
- emacs/guix-init.el
+ emacs/guix-init.el \
+ emacs/guix-profiles.el
$(AUTOLOADS): $(ELFILES)
$(EMACS) --batch --eval \