diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
commit | 9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch) | |
tree | 9add6e882007184cc420b2e26d620de0982d934a /gnu/packages/emacs.scm | |
parent | 9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff) | |
parent | d7ab698a620873c11103fa2bd082884f0198723a (diff) | |
download | guix-patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar guix-patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r-- | gnu/packages/emacs.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 76a8cc566f..1a37bef657 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. @@ -114,6 +114,7 @@ languages.") (define-public emacs-no-x-toolkit (package (inherit emacs) + (location (source-properties->location (current-source-location))) (name "emacs-no-x-toolkit") (synopsis "The extensible, customizable, self-documenting text editor (without an X toolkit)" ) |