diff options
author | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
commit | 9c2130757cc0ac20be3cb255c2c09ede45cc9826 (patch) | |
tree | 2f06ff7fbde58022a6600f76f15d3734587f2ab0 /gnu/packages/emacs.scm | |
parent | e543c8a2c6bdc8f129d02a4b48ff336d0e7b529b (diff) | |
parent | b38e97e03b92d54524953949934884828a1683c1 (diff) | |
download | patches-9c2130757cc0ac20be3cb255c2c09ede45cc9826.tar patches-9c2130757cc0ac20be3cb255c2c09ede45cc9826.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r-- | gnu/packages/emacs.scm | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index df9f4496fb..4a20f0c1a5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> +;;; Copyright © 2016 ng0 <ngillmann@runbox.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com> @@ -2231,6 +2231,30 @@ perspective only its buffers are available by default.") ;; the Expat license. (license license:gpl3+))) +(define-public emacs-rudel + (package + (name "emacs-rudel") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://elpa.gnu.org/packages/rudel-" + version ".tar")) + (sha256 + (base32 + "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz")))) + (build-system emacs-build-system) + (home-page "http://rudel.sourceforge.net/") + (synopsis "Collaborative editing framework") + (description + "Rudel is a collaborative editing environment for GNU Emacs. Its purpose +is to share buffers with other users in order to edit the contents of those +buffers collaboratively. Rudel supports multiple backends to enable +communication with other collaborative editors using different protocols, +though currently Obby (for use with the Gobby editor) is the only +fully-functional one.") + (license license:gpl3+))) + (define-public emacs-hydra (package (name "emacs-hydra") |