amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source 
Conflicts:
	Makefile.am
	gnu/packages/autotools.scm
	gnu/packages/guile.scm
	gnu/packages/python.scm
	gnu/packages/shishi.scm
	guix/gnu-maintenance.scm
	guix/scripts/build.scm
	guix/scripts/gc.scm
	guix/scripts/package.scm
	guix/scripts/substitute-binary.scm
	guix/ui.scm
	nix/nix-daemon/guix-daemon.cc
	test-env.in
	tests/nar.scm
	tests/store.scm
This commit is contained in:
Ludovic Courtès 2013-04-26 16:43:08 +02:00
commit a9db7d10b6
95 changed files with 1796 additions and 511 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/emacs.scm
View file

@ -90,8 +90,7 @@
("patch/epaths" ,(search-patch "emacs-configure-sh.patch"))
))
(home-page "http://www.gnu.org/software/emacs/")
(synopsis
"GNU Emacs 24, the extensible, customizable text editor")
(synopsis "The extensible, customizable, self-documenting text editor")
(description
"GNU Emacs is an extensible, customizable text editor—and more. At its
core is an interpreter for Emacs Lisp, a dialect of the Lisp