[bug#31500] [PATCH 19/21] gnu: emacs-image+: New variable.

[bug#31500] [PATCH 19/21] gnu: emacs-image+: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-image+): New variable.
---
 gnu/packages/emacs.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4e0193031..5a9df8fc8 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10998,3 +10998,41 @@ provided by other Emacs packages dealing with pass:
 - @code{auth-source-pass.el}: integration of Emacs' auth-source with
 @code{pass}, included in Emacs 26+).")
     (license license:gpl3+)))
+
+(define-public emacs-image+
+  (package
+    (name "emacs-image+")
+    (version "20150707.916")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/image+-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0lbgqc9n2ard9nrsk9ri2jazk8l6dv2hrmi83dvsm14kfnnajdil"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("imagemagick" ,imagemagick)))
+    (home-page
+     "https://github.com/mhayashi1120/Emacs-imagex")
+    (synopsis
+     "Image manipulate extensions for Emacs")
+    (description
+     "Type @code{C-x C-l +} to zoom-in the current image.
+You can zoom-out with type @code{-}.
+To manipulate a image under cursor: @code{M-x imagex-sticky-mode}.
+Or to activate globally: @code{M-x imagex-global-sticky-mode}.
+Or in .emacs: @code{(eval-after-load 'image+ '(imagex-global-sticky-mode 1))}.
+
+- @code{C-c +} / `C-c -`: Zoom in/out image.
+- @code{C-c M-m}: Adjust image to current frame size.
+- @code{C-c C-x C-s}: Save current image.
+- @code{C-c M-r} / @code{C-c M-l}: Rotate image.
+- @code{C-c M-o}: Show image @code{image+} have not modified.
+
+Adjusted image when open image file: @code{M-x imagex-auto-adjust-mode}.
+Or in .emacs: @code{(eval-after-load 'image+ '(imagex-auto-adjust-mode 1))}.
+If you do not want error message in minibuffer: @code{(setq imagex-quiet-error t)}.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-daemons): New variable.
---
 gnu/packages/emacs.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index f3d08e810..10bf4c355 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10464,3 +10464,26 @@ Dumb Jump performs best with The Silver Searcher @command{ag} or ripgrep
        "This package provides an Emacs minor mode for highlighting
 device tree files.")
       (license license:gpl3+))))
+
+(define-public emacs-daemons
+  (package
+    (name "emacs-daemons")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/cbowdon/daemons.el/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "14ivawzxiy8q8x2ccpw05ng83zqd70cdkn287yrc2c9nm1ix98bf"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/cbowdon/daemons.el")
+    (synopsis "Emacs UI for managing init system services")
+    (description
+     "This is an Emacs mode to give you a UI for managing init system
+daemons (services) for those getting tired of typing out @code{sudo service
+my_thing reload} all the time.  It's offers a consistent UI over different
+init systems.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Ricardo Wurmus]

Hi Pierre,

> * gnu/packages/emacs.scm (emacs-daemons): New variable.
> ---
>  gnu/packages/emacs.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index f3d08e810..10bf4c355 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -10464,3 +10464,26 @@ Dumb Jump performs best with The Silver Searcher @command{ag} or ripgrep
>         "This package provides an Emacs minor mode for highlighting
>  device tree files.")
>        (license license:gpl3+))))
> +
> +(define-public emacs-daemons
> +  (package
> +    (name "emacs-daemons")
> +    (version "1.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/cbowdon/daemons.el/archive/"
> +                           version ".tar.gz"))

Please do not use these auto-generated tarballs from GitHub, as they are
generated upon demand.  This means that at some point in the future the
hash may change.  Use “git-fetch” instead.

> +       (file-name (string-append name "-" version "-checkout"))

If you’re using a tarball, then the name should not end on “-checkout”.

Thanks!

-- 
Ricardo

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]


Ricardo Wurmus <rekado@elephly.net> writes:

>> +       (uri (string-append "https://github.com/cbowdon/daemons.el/archive/"
>> +                           version ".tar.gz"))
>
> Please do not use these auto-generated tarballs from GitHub, as they are
> generated upon demand.  This means that at some point in the future the
> hash may change.

OK, but I have a few question:

- Why would the hash change?  If the version tag is not changed (and
it's not meant to) the archive remains the same, doesn't it?  Besides
many Emacs packages use the "/archive" URLs, such as
`emacs-emms-player-mpv`.

- Do you know the difference between "/archive and "/releases/download"?
For instance, Magit uses "https://github.com/magit/magit/releases/download/".

That said, I have no issue with using git-fetch instead.  I'll submit a
patch just now.

--
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 1797 bytes --]


* gnu/packages/emacs.scm (emacs-daemons): New variable.
---
 gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index f3d08e810..24ab1ba6f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -34,6 +34,7 @@
 ;;; Copyright © 2017, 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
 ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
+;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -10464,3 +10465,27 @@ Dumb Jump performs best with The Silver Searcher @command{ag} or ripgrep
        "This package provides an Emacs minor mode for highlighting
 device tree files.")
       (license license:gpl3+))))
+
+(define-public emacs-daemons
+  (package
+    (name "emacs-daemons")
+    (version "1.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cbowdon/daemons.el")
+             (commit version)))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/cbowdon/daemons.el")
+    (synopsis "Emacs UI for managing init system services")
+    (description
+     "This is an Emacs mode to give you a UI for managing init system
+daemons (services) for those getting tired of typing out @code{sudo service
+my_thing reload} all the time.  It's offers a consistent UI over different
+init systems.")
+    (license license:gpl3+)))
-- 
2.17.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#31499: [PATCH 01/21] gnu: emacs-daemons: New variable.

[Ricardo Wurmus]

Hi Pierre,

> * gnu/packages/emacs.scm (emacs-daemons): New variable.

thanks for the updated patch.  I pushed it with commit
d0aedb5b1ff2087c92e9a189d2bb30541710871f after minor changes:

* Fixed a typo in the description.
* Changed the git commit summary to “gnu: Add emacs-daemons.”

Thanks!

-- 
Ricardo

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Ricardo Wurmus]

Hi Pierre,

> Ricardo Wurmus <rekado@elephly.net> writes:
>
>>> +       (uri (string-append "https://github.com/cbowdon/daemons.el/archive/"
>>> +                           version ".tar.gz"))
>>
>> Please do not use these auto-generated tarballs from GitHub, as they are
>> generated upon demand.  This means that at some point in the future the
>> hash may change.
>
> OK, but I have a few question:
>
> - Why would the hash change?  If the version tag is not changed (and
> it's not meant to) the archive remains the same, doesn't it?  Besides
> many Emacs packages use the "/archive" URLs, such as
> `emacs-emms-player-mpv`.

Unfortunately, the archive does not remain the same.  These archives are
created on demand and cached for months.  Once they expire they are
recreated.  Since the archives contain timestamps the hash will change.

We still have many packages that use the /archive URLs, which should be
changed eventually.  I have been changing some of these URLs whenever I
updated one of the affected packages, but there are many more that
remain.

> - Do you know the difference between "/archive and "/releases/download"?
> For instance, Magit uses "https://github.com/magit/magit/releases/download/".

Releases are *uploaded* tarballs, not automatically generated tarballs.
Tarballs that have been uploaded to Github won’t change over time.

--
Ricardo

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

On Tue, May 22, 2018 at 11:17:49AM +0200, Ricardo Wurmus wrote:
> Unfortunately, the archive does not remain the same.  These archives are
> created on demand and cached for months.  Once they expire they are
> recreated.  Since the archives contain timestamps the hash will change.

They may also change when the tools used to create the archives by
GitHub are changed. This happened in autumn 2017 and broke many
downloads for many downstream projects. For now, GitHub doesn't
guarantee these snapshot archives are bit-reproducible and recommend
that we don't rely on them to be stable over time. They know that, in
practice, it's an issue.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Clément Lassieur]

Hi Pierre,

In your commit messages, could you replace

    gnu: something: New variable.

with

    gnu: Add something.

Please?

Thank you!
Clément

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]


Sure, I don't know why I started using this format... Did I see that in
a former commit?

Anyways, is it possible with `git send-email` to update all patches at
once by re-using their thread?

--
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]


Pierre Neidhardt <ambrevar@gmail.com> writes:

> Sure, I don't know why I started using this format... Did I see that in
> a former commit?
>
> Anyways, is it possible with `git send-email` to update all patches at
> once by re-using their thread?

OK, I've figure it out:

> git send-email --in-reply-to "<20180518184910.9987-1-ambrevar@gmail.com>" 0001...

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31499] [PATCH 01/21] gnu: emacs-daemons: New variable.

[Clément Lassieur]

Pierre Neidhardt <ambrevar@gmail.com> writes:

> Pierre Neidhardt <ambrevar@gmail.com> writes:
>
>> Sure, I don't know why I started using this format... Did I see that in
>> a former commit?

I think it's because you mixed up the first and second lines :-)

>> Anyways, is it possible with `git send-email` to update all patches at
>> once by re-using their thread?
>
> OK, I've figure it out:
>
>> git send-email --in-reply-to "<20180518184910.9987-1-ambrevar@gmail.com>" 0001...

Cool thank you!

[bug#31501] [PATCH 17/21] gnu: emacs-helm-mu: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-mu): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8ad90560f..baffb94bd 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10937,3 +10937,32 @@ ack-grep instead of grep).
 to current-buffer.
 - In addition, all actions of type files and buffers are provided. ")
     (license license:gpl3+)))
+
+(define-public emacs-helm-mu
+  (package
+    (name "emacs-helm-mu")
+    (version "20180513.221")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-mu-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1l545nr6ifdgmxriw5pqlsqzw9ww0x1f32wpl1ziwyb672h9r5aj"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-mu")
+    (synopsis
+     "Helm sources for searching emails and contacts")
+    (description
+     "Helm sources for searching emails and contacts using @code{mu} and
+@code{mu4e}.  Mu is an indexer for maildirs and mu4e is a mutt-like MUA for
+Emacs build on top of mu.  Mu is highly efficient making it possible
+to get instant results even for huge maildirs.  It also provides
+search operators similar to Google Mail, e.g:
+@code{from:Peter to:Anne flag:attach search term}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31501] [PATCH 17/21] gnu: Add emacs-helm-mu.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-mu): New variable.
---
 gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b8ef9e2c2..097ed0817 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11036,3 +11036,34 @@ projects unrelated to current-buffer.
 @item In addition, all actions of type files and buffers are provided.
 @end itemize\n")
       (license license:gpl3+))))
+
+(define-public emacs-helm-mu
+  (package
+    (name "emacs-helm-mu")
+    (version "20180513")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/emacs-helm/helm-mu/archive/"
+             "77e6fea24e01481418738421dbcfe28ef1bd63cf"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0qm4xi3i957scm50nar398pv4x8y03si10l77jb9ckjaviyq2hj9"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("mu" ,mu)))
+    (home-page
+     "https://github.com/emacs-helm/helm-mu")
+    (synopsis
+     "Helm sources for searching emails and contacts")
+    (description
+     "Helm sources for searching emails and contacts using @code{mu} and
+@code{mu4e}.  Mu is an indexer for maildirs and mu4e is a mutt-like MUA for
+Emacs build on top of mu.  Mu is highly efficient making it possible
+to get instant results even for huge maildirs.  It also provides
+search operators similar to Google Mail, e.g:
+@code{from:Peter to:Anne flag:attach search term}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31501] [PATCH 17/21] gnu: Add emacs-helm-mu.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-mu): New variable.
---
 gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1210d5c78..a0d2f4f9b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11058,3 +11058,35 @@ projects unrelated to current-buffer.
 @item In addition, all actions of type files and buffers are provided.
 @end itemize\n")
       (license license:gpl3+))))
+
+(define-public emacs-helm-mu
+  (let ((commit "77e6fea24e01481418738421dbcfe28ef1bd63cf"))
+    (package
+      (name "emacs-helm-mu")
+      (version (git-version  "20180513" "1" commit))
+      (source
+       (origin
+         (method url-fetch)
+         (uri (string-append
+               "https://github.com/emacs-helm/helm-mu/archive/"
+               commit
+               ".tar.gz"))
+         (sha256
+          (base32
+           "0qm4xi3i957scm50nar398pv4x8y03si10l77jb9ckjaviyq2hj9"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)
+         ("mu" ,mu)))
+      (home-page
+       "https://github.com/emacs-helm/helm-mu")
+      (synopsis
+       "Helm sources for searching emails and contacts")
+      (description
+       "Helm sources for searching emails and contacts using @code{mu} and
+@code{mu4e}.  Mu is an indexer for maildirs and mu4e is a mutt-like MUA for
+Emacs build on top of mu.  Mu is highly efficient making it possible
+to get instant results even for huge maildirs.  It also provides
+search operators similar to Google Mail, e.g:
+@code{from:Peter to:Anne flag:attach search term}")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31501: [PATCH 17/21] gnu: Add emacs-helm-mu.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-mu): New variable.

[...]

> +      (description
> +       "Helm sources for searching emails and contacts using @code{mu} and
> +@code{mu4e}.  Mu is an indexer for maildirs and mu4e is a mutt-like MUA for
> +Emacs build on top of mu.  Mu is highly efficient making it possible
> +to get instant results even for huge maildirs.  It also provides
> +search operators similar to Google Mail, e.g:
> +@code{from:Peter to:Anne flag:attach search term}")

I removed the reference to Google Mail and applied.  Thanks!

[bug#31503] [PATCH 07/21] gnu: emacs-evil-org: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-org): New variable.
---
 gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 94f3895e8..d8e8f6a34 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10619,3 +10619,33 @@ in Emacs+Evil.  It allows you to select and edit matches interactively,
 integrating @code{iedit-mode} into Evil mode with an attempt at sensible
 defaults.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-org
+  (package
+    (name "emacs-evil-org")
+    (version "20180323.1606")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-org-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "06aindvpg8cv8ky4yylfp6z01l25n87rscfh1b1cw3nrgaiky7dn"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page
+     "https://github.com/Somelauw/evil-org-mode")
+    (synopsis "Evil keybindings for Org mode")
+    (description
+     "Supplemental Evil mode key-bindings to Emacs org-mode.  Features:
+- normal, visual and insert mode bindings
+- key bindings organised in key themes
+- operators like > and < to work on headings
+- text objects
+- table support
+- calendar (date selection) support
+- agenda support")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31503] [PATCH 07/21] gnu: Add emacs-evil-org.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-org): New variable.
---
 gnu/packages/emacs.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c3d1328ea..ba48cea78 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10707,3 +10707,37 @@ in Emacs+Evil.  It allows you to select and edit matches interactively,
 integrating @code{iedit-mode} into Evil mode with an attempt at sensible
 defaults.")
     (license license:gpl3+))))
+
+(define-public emacs-evil-org
+  (let ((commit "b6d652a9163d3430a9e0933a554bdbee5244bbf6"))
+    (package
+      (name "emacs-evil-org")
+      (version (git-version "0.1.1" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Somelauw/evil-org-mode")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page
+       "https://github.com/Somelauw/evil-org-mode")
+      (synopsis "Evil keybindings for Org mode")
+      (description
+       "This package adds supplemental Evil mode key-bindings to Emacs
+Org-mode.  It features:
+@itemize
+@item normal, visual and insert mode bindings;
+@item key bindings organised in key themes;
+@item operators like > and < to work on headings;
+@item text objects;
+@item table support;
+@item calendar (date selection) support;
+@item agenda support.
+@end itemize\n")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31503: [PATCH 07/21] gnu: Add emacs-evil-org.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-org): New variable.

Applied!

[bug#31502] [PATCH 05/21] gnu: emacs-evil-mu4e: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-mu4e): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1685a3d2e..9e6cbcda0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10567,3 +10567,27 @@ For some background see https://github.com/magit/evil-magit/issues See the
 README at https://github.com/justbur/evil-magit for a table describing the key
 binding changes.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-mu4e
+  (package
+    (name "emacs-evil-mu4e")
+    (version "20171127.1214")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-mu4e-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "17ssd1xgr8iwmgwpz53xbfmk6si3llh60s8jgqq5fnmxlp1v0iqq"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/JorisE/evil-mu4e")
+    (synopsis "Evil-based key bindings for mu4e")
+    (description
+     "Keybindings for mu4e that make sense for Evil users.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31502] [PATCH 05/21] gnu: Add emacs-evil-mu4e.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-mu4e): New variable.
---
 gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 032fba56c..503c47d5c 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10653,3 +10653,28 @@ For some background see @url{https://github.com/magit/evil-magit/issues/1}.
 See the README at @url{https://github.com/justbur/evil-magit} for a table
 describing the key binding changes.")
       (license license:gpl3+))))
+
+(define-public emacs-evil-mu4e
+  (package
+    (name "emacs-evil-mu4e")
+    (version "0.0.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/JorisE/evil-mu4e/archive/"
+             "c03a0e11afda3092eb1461be09fa6a61ebc0e4f6"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1k3z5h04bqslrkq13paqf8pv9r0rf0zjl0zbb57ly043ds3nvxr2"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-evil" ,emacs-evil)
+       ("mu" ,mu)))
+    (home-page "https://github.com/JorisE/evil-mu4e")
+    (synopsis "Evil-based key bindings for mu4e")
+    (description
+     "Keybindings for mu4e that make sense for Evil users.")
+    (license license:gpl3+)))
-- 
2.17.0

bug#31502: [PATCH 05/21] gnu: Add emacs-evil-mu4e.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-mu4e): New variable.

Applied!

[bug#31504] [PATCH 14/21] gnu: emacs-helm-exwm: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-exwm): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9c3fa1d58..02db56a1a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10836,3 +10836,40 @@ searched for and execute it, or view it's documentation.")
     (description "Helm interface for Emms to browse all tracks and all folders
 from @code{emms-source-file-default-directory}.")
     (license license:gpl3+)))
+
+(define-public emacs-helm-exwm
+  (package
+    (name "emacs-helm-exwm")
+    (version "20180301.958")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-exwm-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "00hm42mkjradg45j6q4w8kzbjg1kylka39vazs1b9wjm82ppnsdh"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-exwm" ,emacs-exwm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-exwm")
+    (synopsis "Helm for EXWM buffers")
+    (description
+     "@code{helm-exwm} runs a Helm session over the list of EXWM buffers.
+To separate EXWM buffers from Emacs buffers in @code{helm-mini}, set up the sources as follows:
+@code{
+  (setq helm-exwm-emacs-buffers-source (helm-exwm-build-emacs-buffers-source))
+  (setq helm-exwm-source (helm-exwm-build-source))
+  (setq helm-mini-default-sources `(helm-exwm-emacs-buffers-source
+                                    helm-exwm-source
+                                    helm-source-recentf)
+}
+@code{helm-exwm-switch} is a convenience X application launcher using Helm to
+switch between the various windows of one or several specific applications.
+See @code{helm-exwm-switch-browser} for an example.
+")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31504] [PATCH 14/21] gnu: Add emacs-helm-exwm.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-exwm): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 861aa5020..0247a45cb 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10931,3 +10931,40 @@ searched for and execute it, or view it's documentation.")
       (description "Helm interface for Emms to browse all tracks and all folders
 from @code{emms-source-file-default-directory}.")
     (license license:gpl3+))))
+
+(define-public emacs-helm-exwm
+  (package
+    (name "emacs-helm-exwm")
+    (version "20180523")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/emacs-helm/helm-exwm/archive/"
+             "82a856c80c8d295e3be522a01c5a15af50d08990"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1xsg2lar1vh7jmj5lnnyi14vssxkgy95sv9r8pbfhbnkjkbjm9pb"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-exwm" ,emacs-exwm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-exwm")
+    (synopsis "Helm for EXWM buffers")
+    (description
+     "@code{helm-exwm} runs a Helm session over the list of EXWM buffers.
+To separate EXWM buffers from Emacs buffers in @code{helm-mini}, set up the sources as follows:
+@code{
+  (setq helm-exwm-emacs-buffers-source (helm-exwm-build-emacs-buffers-source))
+  (setq helm-exwm-source (helm-exwm-build-source))
+  (setq helm-mini-default-sources `(helm-exwm-emacs-buffers-source
+                                    helm-exwm-source
+                                    helm-source-recentf)
+}
+@code{helm-exwm-switch} is a convenience X application launcher using Helm to
+switch between the various windows of one or several specific applications.
+See @code{helm-exwm-switch-browser} for an example.
+")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31504] [PATCH 18/21] gnu: Add emacs-helm-pass.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-pass): New variable.
---
 gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 097ed0817..3308412a7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11067,3 +11067,36 @@ to get instant results even for huge maildirs.  It also provides
 search operators similar to Google Mail, e.g:
 @code{from:Peter to:Anne flag:attach search term}")
     (license license:gpl3+)))
+
+(define-public emacs-helm-pass
+  (package
+    (name "emacs-helm-pass")
+    (version "20180416")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/jabranham/helm-pass/archive/"
+             "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1pgq4hj9wvz7z2fyxwsvbh6rmc1akya84v382nx26rr76iavz6wi"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-password-store" ,emacs-password-store)))
+    (home-page
+     "https://github.com/jabranham/helm-pass")
+    (synopsis
+     "Helm interface of pass, the standard Unix password manager")
+    (description
+     "Users of @code{helm-pass} may also be interested in functionality
+provided by other Emacs packages dealing with pass:
+@itemize
+@item @code{emacs-password-store}, which @code{helm-pass} relies on.
+@item @code{emacs-pass}, a major mode for @code{pass}.
+@item @code{auth-source-pass.el}: integration of Emacs' auth-source with
+@code{pass}, included in Emacs 26+).
+@end itemize\n")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31504] [PATCH 18/21] gnu: Add emacs-helm-pass.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]


Sorry, I've sent this patch to the wrong number, emacs-helm-pass is
actually at 31505@debbugs.gnu.org.

The proper patch for 31504 is emacs-helm-exwm.

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31504] [PATCH 14/21] gnu: Add emacs-helm-exwm.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-exwm): New variable.
---
 gnu/packages/emacs.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 009622e9e..39d1a94de 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10952,3 +10952,41 @@ searched for and execute it, or view it's documentation.")
       (description "Helm interface for Emms to browse all tracks and all folders
 from @code{emms-source-file-default-directory}.")
     (license license:gpl3+))))
+
+(define-public emacs-helm-exwm
+  (let ((commit "82a856c80c8d295e3be522a01c5a15af50d08990"))
+    (package
+      (name "emacs-helm-exwm")
+      (version (git-version "20180523" "1" commit))
+      (source
+       (origin
+         (method url-fetch)
+         (uri (string-append
+               "https://github.com/emacs-helm/helm-exwm/archive/"
+               commit
+               ".tar.gz"))
+         (sha256
+          (base32
+           "1xsg2lar1vh7jmj5lnnyi14vssxkgy95sv9r8pbfhbnkjkbjm9pb"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)
+         ("emacs-exwm" ,emacs-exwm)))
+      (home-page
+       "https://github.com/emacs-helm/helm-exwm")
+      (synopsis "Helm for EXWM buffers")
+      (description
+       "@code{helm-exwm} runs a Helm session over the list of EXWM buffers.
+To separate EXWM buffers from Emacs buffers in @code{helm-mini}, set up the sources as follows:
+@code{
+  (setq helm-exwm-emacs-buffers-source (helm-exwm-build-emacs-buffers-source))
+  (setq helm-exwm-source (helm-exwm-build-source))
+  (setq helm-mini-default-sources `(helm-exwm-emacs-buffers-source
+                                    helm-exwm-source
+                                    helm-source-recentf)
+}
+@code{helm-exwm-switch} is a convenience X application launcher using Helm to
+switch between the various windows of one or several specific applications.
+See @code{helm-exwm-switch-browser} for an example.
+")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31504: [PATCH 14/21] gnu: Add emacs-helm-exwm.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-exwm): New variable.

Applied.

[bug#31505] [PATCH 18/21] gnu: emacs-helm-pass: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-pass): New variable.
---
 gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index baffb94bd..4e0193031 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10966,3 +10966,35 @@ to get instant results even for huge maildirs.  It also provides
 search operators similar to Google Mail, e.g:
 @code{from:Peter to:Anne flag:attach search term}")
     (license license:gpl3+)))
+
+(define-public emacs-helm-pass
+  (package
+    (name "emacs-helm-pass")
+    (version "20180415.2038")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-pass-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1pwf05h29mrn05y7fhznwn0czl7ixynkvmy1fxljj45qdq2r6n8v"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-password-store" ,emacs-password-store)))
+    ;; TODO: Need auth-source-pass with Emacs<26?
+    (home-page
+     "https://github.com/jabranham/helm-pass")
+    (synopsis
+     "Helm interface of pass, the standard Unix password manager")
+    (description
+     "Users of @code{helm-pass} may also be interested in functionality
+provided by other Emacs packages dealing with pass:
+- @code{emacs-password-store}, which @code{helm-pass} relies on.
+- @code{emacs-pass}, a major mode for @code{pass}.
+- @code{auth-source-pass.el}: integration of Emacs' auth-source with
+@code{pass}, included in Emacs 26+).")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31505] [PATCH 18/21] gnu: Add emacs-helm-pass.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-pass): New variable.
---
 gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 097ed0817..3308412a7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11067,3 +11067,36 @@ to get instant results even for huge maildirs.  It also provides
 search operators similar to Google Mail, e.g:
 @code{from:Peter to:Anne flag:attach search term}")
     (license license:gpl3+)))
+
+(define-public emacs-helm-pass
+  (package
+    (name "emacs-helm-pass")
+    (version "20180416")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/jabranham/helm-pass/archive/"
+             "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1pgq4hj9wvz7z2fyxwsvbh6rmc1akya84v382nx26rr76iavz6wi"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-password-store" ,emacs-password-store)))
+    (home-page
+     "https://github.com/jabranham/helm-pass")
+    (synopsis
+     "Helm interface of pass, the standard Unix password manager")
+    (description
+     "Users of @code{helm-pass} may also be interested in functionality
+provided by other Emacs packages dealing with pass:
+@itemize
+@item @code{emacs-password-store}, which @code{helm-pass} relies on.
+@item @code{emacs-pass}, a major mode for @code{pass}.
+@item @code{auth-source-pass.el}: integration of Emacs' auth-source with
+@code{pass}, included in Emacs 26+).
+@end itemize\n")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31505] [PATCH 18/21] gnu: Add emacs-helm-pass.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-pass): New variable.
---
 gnu/packages/emacs.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a0d2f4f9b..06764de1a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11090,3 +11090,37 @@ to get instant results even for huge maildirs.  It also provides
 search operators similar to Google Mail, e.g:
 @code{from:Peter to:Anne flag:attach search term}")
       (license license:gpl3+))))
+
+(define-public emacs-helm-pass
+  (let ((commit "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"))
+    (package
+      (name "emacs-helm-pass")
+      (version (git-version  "20180416" "1" commit))
+      (source
+       (origin
+         (method url-fetch)
+         (uri (string-append
+               "https://github.com/jabranham/helm-pass/archive/"
+               commit
+               ".tar.gz"))
+         (sha256
+          (base32
+           "1pgq4hj9wvz7z2fyxwsvbh6rmc1akya84v382nx26rr76iavz6wi"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)
+         ("emacs-password-store" ,emacs-password-store)))
+      (home-page
+       "https://github.com/jabranham/helm-pass")
+      (synopsis
+       "Helm interface of pass, the standard Unix password manager")
+      (description
+       "Users of @code{helm-pass} may also be interested in functionality
+provided by other Emacs packages dealing with pass:
+@itemize
+@item @code{emacs-password-store}, which @code{helm-pass} relies on.
+@item @code{emacs-pass}, a major mode for @code{pass}.
+@item @code{auth-source-pass.el}: integration of Emacs' auth-source with
+@code{pass}, included in Emacs 26+).
+@end itemize\n")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31505: [PATCH 18/21] gnu: Add emacs-helm-pass.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-pass): New variable.

Applied!

[bug#31506] [PATCH 13/21] gnu: emacs-helm-emms: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-emms): New variable.
---
 gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 87b4acab9..9c3fa1d58 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10811,3 +10811,28 @@ type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
 `describe-bindings ' does, but you can use completion to find the command you
 searched for and execute it, or view it's documentation.")
     (license license:gpl3+)))
+
+(define-public emacs-helm-emms
+  (package
+    (name "emacs-helm-emms")
+    (version "20180405.2228")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-emms-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "14af641kjbvfk0c1k2xjfh6jb2cs7zw256mayrik2ddjysx9jyg5"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-emms" ,emms)))
+    (home-page
+     "https://github.com/emacs-helm/helm-emms")
+    (synopsis "Emms for Helm")
+    (description "Helm interface for Emms to browse all tracks and all folders
+from @code{emms-source-file-default-directory}.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31506] [PATCH 13/21] gnu: Add emacs-helm-emms.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-emms): New variable.
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index d96016073..861aa5020 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10905,3 +10905,29 @@ type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
 `describe-bindings ' does, but you can use completion to find the command you
 searched for and execute it, or view it's documentation.")
     (license license:gpl3+))))
+
+(define-public emacs-helm-emms
+  (let ((commit "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec"))
+    (package
+      (name "emacs-helm-emms")
+      (version (git-version "1.3" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-helm/helm-emms")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)
+         ("emacs-emms" ,emms)))
+      (home-page
+       "https://github.com/emacs-helm/helm-emms")
+      (synopsis "Emms for Helm")
+      (description "Helm interface for Emms to browse all tracks and all folders
+from @code{emms-source-file-default-directory}.")
+    (license license:gpl3+))))
-- 
2.17.0

bug#31506: [PATCH 13/21] gnu: Add emacs-helm-emms.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-emms): New variable.

Applied.

[bug#31507] [PATCH 04/21] gnu: emacs-evil-magit: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-magit): New variable.
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fd2fc54fc..1685a3d2e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10539,3 +10539,31 @@ autosuggestions with:
 users of vim-like keybindings.  Consult the help buffer for more
 information.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-magit
+  (package
+    (name "emacs-evil-magit")
+    (version "20180410.804")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-magit-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "19cfgsdlyjldwic5ff7104b7a21l206gmsddsr13w3b6974f4xik"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-evil" ,emacs-evil)
+       ("magit" ,magit)))
+    (home-page
+     "https://github.com/emacs-evil/evil-magit")
+    (synopsis "Evil-based key bindings for magit")
+    (description
+     "This library configures Magit and Evil to play well with each other.
+For some background see https://github.com/magit/evil-magit/issues See the
+README at https://github.com/justbur/evil-magit for a table describing the key
+binding changes.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31507] [PATCH 04/21] gnu: Add emacs-evil-magit.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-magit): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0c2081c90..032fba56c 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10624,3 +10624,32 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
 users of Vim-like keybindings.  Consult the help buffer for more
 information.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-magit
+  (let ((commit "dbf5a646a7ce1c35c229dfdc423bd5ecd927a3a8"))
+    (package
+      (name "emacs-evil-magit")
+      (version (git-version "0.4.2" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-evil/evil-magit")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "0ya0dkviq4pi92ab69a4j674y5r1hc1x3x7r7hlm97ag3a6zfkav"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)
+         ("magit" ,magit)))
+      (home-page
+       "https://github.com/emacs-evil/evil-magit")
+      (synopsis "Evil-based key bindings for Magit")
+      (description
+       "This library configures Magit and Evil to play well with each other.
+For some background see @url{https://github.com/magit/evil-magit/issues/1}.
+See the README at @url{https://github.com/justbur/evil-magit} for a table
+describing the key binding changes.")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31507: [PATCH 04/21] gnu: Add emacs-evil-magit.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-magit): New variable.

Applied, thanks!

[bug#31508] [PATCH 21/21] gnu: emacs-wgrep-helm: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-wgrep-helm): New variable.
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1b598ea94..9d09dd098 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11062,3 +11062,29 @@ e.g. the package dependencies it requires.  See function
 @code{package-lint-buffer}.  Checks will currently be enabled only if a
 \"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
     (license license:gpl3+)))
+
+(define-public emacs-wgrep-helm
+  (package
+    (name "emacs-wgrep-helm")
+    (version "20170510.1539")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/wgrep-helm-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0yaf976nvidwrkmflhrg2arhnrz7kn4fk2dk68082dk26ra74a0n"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-wgrep" ,emacs-wgrep)))
+    (home-page
+     "https://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep-helm.el")
+    (synopsis
+     "Writable helm-grep-mode buffer and apply the changes to files")
+    (description
+     "@code{wgrep-helm} allows you to edit a @code{helm-grep-mode} buffer and
+apply those changes to the file buffer.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31508] [PATCH 21/21] gnu: Add Add emacs-wgrep-helm.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-wgrep-helm): New variable.
---
 gnu/packages/emacs.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index f2c1c6a76..7cab17a94 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11168,3 +11168,30 @@ e.g. the package dependencies it requires.  See function
 @code{package-lint-buffer}.  Checks will currently be enabled only if a
 \"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
     (license license:gpl3+))))
+
+(define-public emacs-wgrep-helm
+  (let ((commit "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"))
+    (package
+      (name "emacs-wgrep-helm")
+      (version (git-version "2.1.10" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mhayashi1120/Emacs-wgrep")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-wgrep" ,emacs-wgrep)))
+      (home-page
+       "https://github.com/mhayashi1120/Emacs-wgrep")
+      (synopsis
+       "Writable helm-grep-mode buffer and apply the changes to files")
+      (description
+       "@code{wgrep-helm} allows you to edit a @code{helm-grep-mode} buffer and
+apply those changes to the file buffer.")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31508: [PATCH 21/21] gnu: Add Add emacs-wgrep-helm.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-wgrep-helm): New variable.

Applied.

Thanks for this whole patch series, and sorry for taking this long to
apply!

Ludo’.

[bug#31509] [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-ediff): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b84c58e2e..fd2fc54fc 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10515,3 +10515,27 @@ Unless you're using @code{use-package}'s hook keyword, you can enable the
 autosuggestions with:
 @code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}")
     (license license:gpl3+)))
+
+(define-public emacs-evil-ediff
+  (package
+    (name "emacs-evil-ediff")
+    (version "20170724.1223")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-ediff-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1sinr8r8iiimacr2szpz8ln32ngjar7ix8pvaiiz05i8g2xy7d57"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/emacs-evil/evil-ediff")
+    (synopsis "Make ediff a little evil")
+    (description
+     "Make ediff a little evil.  This configures ediff to be friendlier to
+users of vim-like keybindings.  Consult the help buffer for more
+information.")
+    (license license:gpl3+)))
-- 
2.17.0

bug#31509: [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-ediff): New variable.

Applied, thanks!

[bug#31509] [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-ediff): New variable.

Actually we’re not done.   :-/

> +       (uri (string-append
> +             "https://melpa.org/packages/evil-ediff-"
> +             version
> +             ".el"))

We cannot use melpa.org URLs because they are highly volatile.  For
instance, the URL for evil-magit.el in the patch that you sent is
already 404.

That’s why we instead refer to upstream URLs (on GitHub or other hosting
sites.)

Could you resent this series with such URLs?  I understand it’s
cumbersome but it’s really important if we want to be able to build
these things even just a couple of weeks from now.

(Please send each updated patch to the right NNN@debbugs.gnu.org
address.)

Thanks in advance,
Ludo’.

[bug#31509] [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]


Indeed...

But then we should urgently modify `guix import elpa` accordingly ;)

I'll resubmit the patches as soon as possible.

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31509] [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]


I've sent all updated patches to their respective NNN@debbugs.gnu.org.

Sorry for the mess :(
(And I hope I didn't make it any worse.)

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31509] [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> Indeed...
>
> But then we should urgently modify `guix import elpa` accordingly ;)

Unfortunately I don’t think the “real” upstream URLs can be
automatically inferred.

Ludo’.

[bug#31509] [PATCH 03/21] gnu: emacs-evil-ediff: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]


I haven't looked into the details, but why not?
I think all MELPA packages have an upstream URL.

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31509] [PATCH 03/21] gnu: Add emacs-evil-ediff.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-ediff): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 90b7fb2ca..0c2081c90 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10600,3 +10600,27 @@ This code is still alpha.")
 and the Zotero research assistant: Insertion of links to Zotero items into an
 Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-ediff
+  (package
+    (name "emacs-evil-ediff")
+    (version "20170724")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/emacs-evil/evil-ediff/archive/"
+             "67b0e69f65c196eff5b39dacb7a9ec05bb919c74"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0j2x26zfc6md54mjf76qpybil4yal70lp5bifcz62l1f8fc1vvlq"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/emacs-evil/evil-ediff")
+    (synopsis "Make Ediff a little evil")
+    (description
+     "Make Ediff a little evil.  This configures Ediff to be friendlier to
+users of Vim-like keybindings.  Consult the help buffer for more
+information.")
+    (license license:gpl3+)))
-- 
2.17.0

bug#31509: [PATCH 03/21] gnu: Add emacs-evil-ediff.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-ediff): New variable.

Applied, thanks!

[bug#31510] [PATCH 16/21] gnu: emacs-helm-ls-git: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-ls-git): New variable.
---
 gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c84f97ae9..8ad90560f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10904,3 +10904,36 @@ See @code{helm-exwm-switch-browser} for an example.
   '(define-key flycheck-mode-map (kbd \"C-c ! h\") 'helm-flycheck))
 }")
     (license license:gpl3+)))
+
+(define-public emacs-helm-ls-git
+  (package
+    (name "emacs-helm-ls-git")
+    (version "20180426.1126")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-ls-git-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "04sphfw7izcqw7jzrrda9sq0c2j65qrky2gqqaz3bc92qd9wky3m"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+    (home-page "https://github.com/emacs-helm/helm-ls-git")
+    (synopsis "Yet another Helm for listing the files in a git repo")
+    (description
+     "Features:
+- Display the open buffers in project.
+- Display a status source showing state of project (modified files etc...).
+- Display a list of all files in project under git control.
+- Allow looking quickly at diff on modified files.
+- Allow switching to git status with your prefered frontend (vc-dir, magit,etc...)
+- Full integration of git-grep, allow also usage of helm-grep (you can use
+ack-grep instead of grep).
+- Integrate usage of gid from id-utils.
+- Full integration with helm-find-files, allow you to browse project unrelated
+to current-buffer.
+- In addition, all actions of type files and buffers are provided. ")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31510] [PATCH 16/21] gnu: Add emacs-helm-ls-git.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-ls-git): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index df014c12a..b8ef9e2c2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10999,3 +10999,40 @@ See @code{helm-exwm-switch-browser} for an example.
   '(define-key flycheck-mode-map (kbd \"C-c ! h\") 'helm-flycheck))
 }")
     (license license:gpl3+))))
+
+(define-public emacs-helm-ls-git
+  (let ((commit "76654c776a7f6e2e5290645e748aac2a746f7daa"))
+    (package
+      (name "emacs-helm-ls-git")
+      (version (git-version "1.9.1" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-helm/helm-ls-git")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "0vsq1n3xl3ghy5zik2scm7jrs501n4kybdqd6yw6j0cv4jxdqbr0"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+      (home-page "https://github.com/emacs-helm/helm-ls-git")
+      (synopsis "Yet another Helm for listing the files in a git repo")
+      (description
+       "This package provides a Helm interface for git files.
+@itemize
+@item Display the open buffers in project.
+@item Display a status source showing state of project (modified files etc.).
+@item Display a list of all files in project under git control.
+@item Quickly look at diffs of modified files.
+@item Allow switching to @code{git status} with your preferred frontend
+(vc-dir, Magit,etc.).
+@item Full integration of git-grep, also allow usage of @code{helm-grep} (you
+can use ack-grep instead of grep).
+@item Integrate usage of gid from id-utils.
+@item Full integration with @code{helm-find-files}, allow you to browse
+projects unrelated to current-buffer.
+@item In addition, all actions of type files and buffers are provided.
+@end itemize\n")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31510: [PATCH 16/21] gnu: Add emacs-helm-ls-git.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-ls-git): New variable.

Applied, thanks!

[bug#31511] [PATCH 20/21] gnu: emacs-package-lint: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-package-lint): New variable.
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 5a9df8fc8..1b598ea94 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11036,3 +11036,29 @@ Adjusted image when open image file: @code{M-x imagex-auto-adjust-mode}.
 Or in .emacs: @code{(eval-after-load 'image+ '(imagex-auto-adjust-mode 1))}.
 If you do not want error message in minibuffer: @code{(setq imagex-quiet-error t)}.")
     (license license:gpl3+)))
+
+(define-public emacs-package-lint
+  (package
+    (name "emacs-package-lint")
+    (version "20180505.1828")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/package-lint-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "0ahaipd49c4jhsjmrh35ck03g4sq37zms372w7ip1y4425qscnbp"))))
+    (build-system emacs-build-system)
+    (home-page
+     "https://github.com/purcell/package-lint")
+    (synopsis
+     "Linting library for elisp package authors")
+    (description
+     "Provides a list of issues with the package metadata of a file,
+e.g. the package dependencies it requires.  See function
+@code{package-lint-buffer}.  Checks will currently be enabled only if a
+\"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31511] [PATCH 20/21] gnu: Add emacs-package-lint.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-package-lint): New variable.
---
 gnu/packages/emacs.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1eff953ce..f2c1c6a76 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11141,3 +11141,30 @@ Adjusted image when open image file: @code{M-x imagex-auto-adjust-mode}.
 Or in .emacs: @code{(eval-after-load 'image+ '(imagex-auto-adjust-mode 1))}.
 If you do not want error message in minibuffer: @code{(setq imagex-quiet-error t)}.")
     (license license:gpl3+))))
+
+(define-public emacs-package-lint
+  (let ((commit "69bb89d00ba212b734c676ad056aa793c450b288"))
+    (package
+      (name "emacs-package-lint")
+      (version (git-version "0.5" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/purcell/package-lint")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "1hfricsgmy3x9snnd2p4xq6vnnv94qdsxxnxp07b3hqc9bhw31rq"))))
+      (build-system emacs-build-system)
+      (home-page
+       "https://github.com/purcell/package-lint")
+      (synopsis
+       "Linting library for elisp package authors")
+      (description
+       "Provides a list of issues with the package metadata of a file,
+e.g. the package dependencies it requires.  See function
+@code{package-lint-buffer}.  Checks will currently be enabled only if a
+\"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
+    (license license:gpl3+))))
-- 
2.17.0

[bug#31511] [PATCH 20/21] gnu: Add emacs-package-lint.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-package-lint): New variable.

Applied.

[bug#31512] [PATCH 11/21] gnu: emacs-helm-company: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-company): New variable.
---
 gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ce5f9bdb8..9f86dd6c7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10751,3 +10751,34 @@ Default UI or Smooth UI.  Please read the source of
 @code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
 for more details.")
     (license license:gpl3+)))
+
+(define-public emacs-helm-company
+  (package
+    (name "emacs-helm-company")
+    (version "20180213.1405")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-company-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "02b0s24rjjj36c95zrl2vysbh9pcx70rja0n7k0vys7n4hwwm648"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-company" ,emacs-company)))
+    (home-page
+     "https://github.com/Sodel-the-Vociferous/helm-company")
+    (synopsis "Helm interface for company-mode")
+    (description
+     "Add the following to your Emacs init file:
+@code{
+(autoload 'helm-company \"helm-company\") ;; Not necessary if using ELPA package
+(eval-after-load 'company
+  '(progn
+     (define-key company-mode-map (kbd \"C-:\") 'helm-company)
+     (define-key company-active-map (kbd \"C-:\") 'helm-company)))}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31512] [PATCH 11/21] gnu: Add emacs-helm-company.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-company): New variable.
---
 gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 577ef9f99..b582ce992 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10843,3 +10843,35 @@ Default UI or Smooth UI.  Please read the source of
 @code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
 for more details.")
     (license license:gpl3+))))
+
+(define-public emacs-helm-company
+  (let ((commit "acc9c7901e094c1591327a0db1ec7a439f67a84d"))
+    (package
+      (name "emacs-helm-company")
+      (version (git-version "0.2.2" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Sodel-the-Vociferous/helm-company")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)
+         ("emacs-company" ,emacs-company)))
+      (home-page
+       "https://github.com/Sodel-the-Vociferous/helm-company")
+      (synopsis "Helm interface for company-mode")
+      (description
+       "Add the following to your Emacs init file:
+@code{
+(autoload 'helm-company \"helm-company\") ;; Not necessary if using ELPA package
+(eval-after-load 'company
+  '(progn
+     (define-key company-mode-map (kbd \"C-:\") 'helm-company)
+     (define-key company-active-map (kbd \"C-:\") 'helm-company)))}")
+    (license license:gpl3+))))
-- 
2.17.0

bug#31512: [PATCH 11/21] gnu: Add emacs-helm-company.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-company): New variable.

Applied.

[bug#31513] [PATCH 15/21] gnu: emacs-helm-flycheck: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-flycheck): New variable.
---
 gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 02db56a1a..c84f97ae9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10873,3 +10873,34 @@ switch between the various windows of one or several specific applications.
 See @code{helm-exwm-switch-browser} for an example.
 ")
     (license license:gpl3+)))
+
+(define-public emacs-helm-flycheck
+  (package
+    (name "emacs-helm-flycheck")
+    (version "20160710.129")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-flycheck-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "157yf5xk6wy1li06ifk0mp6iw4yb0ny3h2mrna3m1zsi3anj1pzh"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-flycheck" ,flycheck)
+       ("emacs-helm" ,emacs-helm)))
+    (home-page
+     "https://github.com/yasuyk/helm-flycheck")
+    (synopsis "Show flycheck errors with Helm")
+    (description
+     "Add the following to your Emacs init file:
+@code{
+(require 'helm-flycheck) ;; Not necessary if using ELPA package
+(eval-after-load 'flycheck
+  '(define-key flycheck-mode-map (kbd \"C-c ! h\") 'helm-flycheck))
+}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31513] [PATCH 15/21] gnu: Add emacs-helm-flycheck.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-flycheck): New variable.
---
 gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0247a45cb..df014c12a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10968,3 +10968,34 @@ switch between the various windows of one or several specific applications.
 See @code{helm-exwm-switch-browser} for an example.
 ")
     (license license:gpl3+)))
+
+(define-public emacs-helm-flycheck
+  (let ((commit "3cf7d3bb194acacc6395f88360588013d92675d6"))
+    (package
+      (name "emacs-helm-flycheck")
+      (version (git-version "0.4" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/yasuyk/helm-flycheck")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "1a2yfxhz04klwhcandqvfzysxp6b7bxyxx1xk1x3kds5hif5fkl4"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-flycheck" ,flycheck)
+         ("emacs-helm" ,emacs-helm)))
+      (home-page
+       "https://github.com/yasuyk/helm-flycheck")
+      (synopsis "Show flycheck errors with Helm")
+      (description
+       "Add the following to your Emacs init file:
+@code{
+(eval-after-load 'flycheck
+  '(define-key flycheck-mode-map (kbd \"C-c ! h\") 'helm-flycheck))
+}")
+    (license license:gpl3+))))
-- 
2.17.0

bug#31513: [PATCH 15/21] gnu: Add emacs-helm-flycheck.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-helm-flycheck): New variable.

Applied.

[bug#31514] [PATCH 09/21] gnu: emacs-gif-screencast: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-gif-screencast): New variable.
---
 gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 82f250f34..6fb11a0a3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10684,3 +10684,33 @@ The package @code{emacs-bash-completion} is an optional dependency: if available
 @code{fish-completion-complete} can be configured to fall back on bash to further
 try completing.  See @code{fish-completion-fallback-on-bash-p}.")
     (license license:gpl3+)))
+
+(define-public emacs-gif-screencast
+  (package
+    (name "emacs-gif-screencast")
+    (version "20180309.242")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/gif-screencast-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1xva240kx0w4x0x6cd42lyj87gi2i2s0fhpj3ca9klw9z5ffb55f"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("scrot" ,scrot)
+       ("imagemagick" ,imagemagick)
+       ;; ("gifsicle" ,gifsicle) ; TODO: Add gifsicle.
+       ))
+    (home-page
+     "https://github.com/ambrevar/emacs-gif-screencast")
+    (synopsis "One-frame-per-action GIF recording")
+    (description
+     "Call @code{gif-screencast} to start a recording.
+A screenshot is taken for every user action.  Call
+@code{gif-screencast-stop} (<f9> by default) to finish recording and create
+the GIF result.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31514] [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-gif-screencast): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 303d0dcab..8484a31fe 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10776,3 +10776,32 @@ The package @code{emacs-bash-completion} is an optional dependency: if available
 @code{fish-completion-complete} can be configured to fall back on bash to further
 try completing.  See @code{fish-completion-fallback-on-bash-p}.")
     (license license:gpl3+)))
+
+(define-public emacs-gif-screencast
+  (package
+    (name "emacs-gif-screencast")
+    (version "20180309")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/Ambrevar/emacs-gif-screencast/archive/"
+             "825e606950ec842304bf75cf85baef707b853b03"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1f83sdx4qj4g6byvbdq7aayissbcy5lqm43djp8h0lq455nf7jkc"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("scrot" ,scrot)
+       ("imagemagick" ,imagemagick)
+       ("gifsicle" ,gifsicle)))
+    (home-page
+     "https://github.com/Ambrevar/emacs-gif-screencast")
+    (synopsis "One-frame-per-action GIF recording")
+    (description
+     "Call @code{gif-screencast} to start a recording.
+A screenshot is taken for every user action.  Call
+@code{gif-screencast-stop} (<f9> by default) to finish recording and create
+the GIF result.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31514] [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-gif-screencast): New variable.

[...]

> +  (package
> +    (name "emacs-gif-screencast")
> +    (version "20180309")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://github.com/Ambrevar/emacs-gif-screencast/archive/"
> +             "825e606950ec842304bf75cf85baef707b853b03"
> +             ".tar.gz"))

Could you use the usual scheme for version numbers of Git snapshots
(info "(guix) Version Numbers")?

> +    (propagated-inputs
> +     `(("scrot" ,scrot)
> +       ("imagemagick" ,imagemagick)
> +       ("gifsicle" ,gifsicle)))

Instead of propagating these, which could “pollute” the user’s profile,
could you hardcode the absolute file names of these programs in the .el
files?  See how this is done for EMMS, for instance.

> +    (home-page
> +     "https://github.com/Ambrevar/emacs-gif-screencast")
> +    (synopsis "One-frame-per-action GIF recording")

This looks very useful!

TIA!

Ludo’.

[bug#31514] [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]


Ludovic Courtès <ludo@gnu.org> writes:

> Pierre Neidhardt <ambrevar@gmail.com> skribis:
>
>> * gnu/packages/emacs.scm (emacs-gif-screencast): New variable.
>
> [...]
>
>> +  (package
>> +    (name "emacs-gif-screencast")
>> +    (version "20180309")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append
>> +             "https://github.com/Ambrevar/emacs-gif-screencast/archive/"
>> +             "825e606950ec842304bf75cf85baef707b853b03"
>> +             ".tar.gz"))
>
> Could you use the usual scheme for version numbers of Git snapshots
> (info "(guix) Version Numbers")?

I followed the form of emacs-zotxt that was just packaged.
emacs-gif-screencast, like many other Emacs packages, has no version
number.
Do you suggest something like

--8<---------------cut here---------------start------------->8---
(let ((commit ...))
  ; ...
	(gitversion "20180309" "1" commit)
--8<---------------cut here---------------end--------------->8---

?

>> +    (propagated-inputs
>> +     `(("scrot" ,scrot)
>> +       ("imagemagick" ,imagemagick)
>> +       ("gifsicle" ,gifsicle)))
>
> Instead of propagating these, which could “pollute” the user’s profile,
> could you hardcode the absolute file names of these programs in the .el
> files?  See how this is done for EMMS, for instance.

Ack.

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31514] [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Pierre Neidhardt <ambrevar@gmail.com> skribis:
>>
>>> * gnu/packages/emacs.scm (emacs-gif-screencast): New variable.
>>
>> [...]
>>
>>> +  (package
>>> +    (name "emacs-gif-screencast")
>>> +    (version "20180309")
>>> +    (source
>>> +     (origin
>>> +       (method url-fetch)
>>> +       (uri (string-append
>>> +             "https://github.com/Ambrevar/emacs-gif-screencast/archive/"
>>> +             "825e606950ec842304bf75cf85baef707b853b03"
>>> +             ".tar.gz"))
>>
>> Could you use the usual scheme for version numbers of Git snapshots
>> (info "(guix) Version Numbers")?
>
> I followed the form of emacs-zotxt that was just packaged.
> emacs-gif-screencast, like many other Emacs packages, has no version
> number.
> Do you suggest something like
>
> (let ((commit ...))
>   ; ...
> 	(gitversion "20180309" "1" commit)
>
> ?

Yes.  I think it’s useful to have the shortened commit ID in the version
string.

Thanks,
Ludo’.

[bug#31514] [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]


I've applied the changes to gif-screencast, helm-pass, helm-exwm, and
helm-mu.  Let me know if there is anything else.

--
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31514] [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-gif-screencast): New variable.
---
 gnu/packages/emacs.scm | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 303d0dcab..601805a8e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10776,3 +10776,53 @@ The package @code{emacs-bash-completion} is an optional dependency: if available
 @code{fish-completion-complete} can be configured to fall back on bash to further
 try completing.  See @code{fish-completion-fallback-on-bash-p}.")
     (license license:gpl3+)))
+
+(define-public emacs-gif-screencast
+  (let ((commit "825e606950ec842304bf75cf85baef707b853b03"))
+    (package
+      (name "emacs-gif-screencast")
+      (version (git-version "20180309" "1" commit))
+      (source
+       (origin
+         (method url-fetch)
+         (uri (string-append
+               "https://github.com/Ambrevar/emacs-gif-screencast/archive/"
+               commit
+               ".tar.gz"))
+         (sha256
+          (base32
+           "1f83sdx4qj4g6byvbdq7aayissbcy5lqm43djp8h0lq455nf7jkc"))))
+      (build-system emacs-build-system)
+      (inputs
+       `(("scrot" ,scrot)
+         ("imagemagick" ,imagemagick)
+         ("gifsicle" ,gifsicle)))
+     (arguments
+      `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'configure
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((scrot (assoc-ref inputs "scrot"))
+                   (imagemagick (assoc-ref inputs "imagemagick"))
+                   (gifsicle (assoc-ref inputs "gifsicle")))
+               ;; Specify the absolute file names of the various
+               ;; programs so that everything works out-of-the-box.
+               (emacs-substitute-variables
+                   "gif-screencast.el"
+                 ("gif-screencast-program"
+                  (string-append scrot "/bin/scrot"))
+                 ("gif-screencast-convert-program"
+                  (string-append imagemagick "/bin/convert"))
+                 ("gif-screencast-cropping-program"
+                  (string-append imagemagick "/bin/mogrify"))
+                 ("gif-screencast-optimize-program"
+                  (string-append imagemagick "/bin/gifsicle")))))))))
+      (home-page
+       "https://github.com/Ambrevar/emacs-gif-screencast")
+      (synopsis "One-frame-per-action GIF recording")
+      (description
+       "Call @code{gif-screencast} to start a recording.
+A screenshot is taken for every user action.  Call
+@code{gif-screencast-stop} (<f9> by default) to finish recording and create
+the GIF result.")
+      (license license:gpl3+))))
-- 
2.17.0

bug#31514: [PATCH 09/21] gnu: Add emacs-gif-screencast.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-gif-screencast): New variable.

Perfect.  Applied, thanks!

Ludo’.

[bug#31515] [PATCH 12/21] gnu: emacs-helm-descbinds: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-descbinds): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9f86dd6c7..87b4acab9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10782,3 +10782,32 @@ for more details.")
      (define-key company-mode-map (kbd \"C-:\") 'helm-company)
      (define-key company-active-map (kbd \"C-:\") 'helm-company)))}")
     (license license:gpl3+)))
+
+(define-public emacs-helm-descbinds
+  (package
+    (name "emacs-helm-descbinds")
+    (version "20180429.756")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-descbinds-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0ibmxps9qmlri2m7dl05fkzm9v5mbvpqfddx713fkhzmgc3k0y33"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-descbinds")
+    (synopsis
+     "Convenient `describe-bindings' with `helm'")
+    (description
+     "This package is a replacement of @code{describe-bindings} for Helm.
+@code{describe-bindings} is replaced with @code{helm-descbinds}.  As usual,
+type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
+@code{helm-descbinds}.  The bindings are presented in a similar way as
+`describe-bindings ' does, but you can use completion to find the command you
+searched for and execute it, or view it's documentation.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31515] [PATCH 12/21] gnu: Add emacs-helm-descbinds.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-descbinds): New variable.
---
 gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b582ce992..d96016073 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10875,3 +10875,33 @@ for more details.")
      (define-key company-mode-map (kbd \"C-:\") 'helm-company)
      (define-key company-active-map (kbd \"C-:\") 'helm-company)))}")
     (license license:gpl3+))))
+
+(define-public emacs-helm-descbinds
+  (let ((commit "033be73f21778633813264ce1634a6e1ad873d8e"))
+    (package
+      (name "emacs-helm-descbinds")
+      (version (git-version "1.13" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-helm/helm-descbinds")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "1n89p56qwa243w1c85i5awnaf7piwjsvfi7nmnsrwm33hix5dknk"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+      (home-page
+       "https://github.com/emacs-helm/helm-descbinds")
+      (synopsis
+       "Convenient `describe-bindings' with `helm'")
+      (description
+       "This package is a replacement of @code{describe-bindings} for Helm.
+@code{describe-bindings} is replaced with @code{helm-descbinds}.  As usual,
+type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
+@code{helm-descbinds}.  The bindings are presented in a similar way as
+`describe-bindings ' does, but you can use completion to find the command you
+searched for and execute it, or view it's documentation.")
+    (license license:gpl3+))))
-- 
2.17.0

[bug#31516] [PATCH 06/21] gnu: emacs-evil-multiedit: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-multiedit): New variable.
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9e6cbcda0..94f3895e8 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10591,3 +10591,31 @@ binding changes.")
     (description
      "Keybindings for mu4e that make sense for Evil users.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-multiedit
+  (package
+    (name "emacs-evil-multiedit")
+    (version "20180209.1819")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-multiedit-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0l3hmhpib853rg6v65z5yvnl8zb7kamcspgifwnv5g000b6g2yxk"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-evil" ,emacs-evil)
+       ("emacs-iedit" ,emacs-iedit)))
+    (home-page
+     "https://github.com/hlissner/evil-multiedit")
+    (synopsis "Multiple cursors for Evil mode")
+    (description
+     "This plugin was an answer to the lack of proper multiple cursor support
+in Emacs+Evil.  It allows you to select and edit matches interactively,
+integrating @code{iedit-mode} into Evil mode with an attempt at sensible
+defaults.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31516] [PATCH 06/21] gnu: Add emacs-evil-multiedit.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-multiedit): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 503c47d5c..c3d1328ea 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10678,3 +10678,32 @@ describing the key binding changes.")
     (description
      "Keybindings for mu4e that make sense for Evil users.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-multiedit
+  (let ((commit "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d"))
+    (package
+      (name "emacs-evil-multiedit")
+      (version (git-version "1.3.9" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/hlissner/evil-multiedit")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)
+         ("emacs-iedit" ,emacs-iedit)))
+      (home-page
+       "https://github.com/hlissner/evil-multiedit")
+      (synopsis "Multiple cursors for Evil mode")
+      (description
+       "This plugin was an answer to the lack of proper multiple cursor support
+in Emacs+Evil.  It allows you to select and edit matches interactively,
+integrating @code{iedit-mode} into Evil mode with an attempt at sensible
+defaults.")
+    (license license:gpl3+))))
-- 
2.17.0

bug#31516: [PATCH 06/21] gnu: Add emacs-evil-multiedit.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-evil-multiedit): New variable.

Applied!

[bug#31517] [PATCH 02/21] gnu: emacs-esh-autosuggest: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-esh-autosuggest): New variable.
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 10bf4c355..b84c58e2e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10487,3 +10487,31 @@ daemons (services) for those getting tired of typing out @code{sudo service
 my_thing reload} all the time.  It's offers a consistent UI over different
 init systems.")
     (license license:gpl3+)))
+
+(define-public emacs-esh-autosuggest
+  (package
+    (name "emacs-esh-autosuggest")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/dieggsy/esh-autosuggest/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "0swf054vpk2h6285jmibp2wpy1vg5mdlimgjyyzpgwpj6k5xwgdf"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-company" ,emacs-company)))
+    (home-page "https://github.com/dieggsy/esh-autosuggest")
+    (synopsis "Fish-like autosuggestions in Eshell")
+    (description
+     "This package assumes you use something other than company for eshell
+completion (e.g. @code{eshell-pcomplete}, @code{completion-at-point},
+@code{helm-esh-pcomplete}).  @code{company-mode} is used solely as a mechanism
+for history autosuggestions.
+
+Unless you're using @code{use-package}'s hook keyword, you can enable the
+autosuggestions with:
+@code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31517] [PATCH 02/21] gnu: emacs-esh-autosuggest: New variable.

[Ricardo Wurmus]

Hi Pierre,

> * gnu/packages/emacs.scm (emacs-esh-autosuggest): New variable.
> ---
>  gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 10bf4c355..b84c58e2e 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -10487,3 +10487,31 @@ daemons (services) for those getting tired of typing out @code{sudo service
>  my_thing reload} all the time.  It's offers a consistent UI over different
>  init systems.")
>      (license license:gpl3+)))
> +
> +(define-public emacs-esh-autosuggest
> +  (package
> +    (name "emacs-esh-autosuggest")
> +    (version "2.0.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/dieggsy/esh-autosuggest/archive/"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version "-checkout"))

The same comment as for “emacs-daemons” applies here.  Could you please
change this in all of your patches?

-- 
Ricardo

[bug#31517] [PATCH 02/21] gnu: emacs-esh-autosuggest: New variable.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 1739 bytes --]


* gnu/packages/emacs.scm (emacs-esh-autosuggest): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 24ab1ba6f..db4ff5652 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10489,3 +10489,32 @@ daemons (services) for those getting tired of typing out @code{sudo service
 my_thing reload} all the time.  It's offers a consistent UI over different
 init systems.")
     (license license:gpl3+)))
+
+(define-public emacs-esh-autosuggest
+  (package
+    (name "emacs-esh-autosuggest")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dieggsy/esh-autosuggest")
+             (commit version)))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-company" ,emacs-company)))
+    (home-page "https://github.com/dieggsy/esh-autosuggest")
+    (synopsis "Fish-like autosuggestions in Eshell")
+    (description
+     "This package assumes you use something other than company for eshell
+completion (e.g. @code{eshell-pcomplete}, @code{completion-at-point},
+@code{helm-esh-pcomplete}).  @code{company-mode} is used solely as a mechanism
+for history autosuggestions.
+
+Unless you're using @code{use-package}'s hook keyword, you can enable the
+autosuggestions with:
+@code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}")
+    (license license:gpl3+)))
-- 
2.17.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#31517: [PATCH 02/21] gnu: emacs-esh-autosuggest: New variable.

[Ricardo Wurmus]

Hi Pierre,

> * gnu/packages/emacs.scm (emacs-esh-autosuggest): New variable.

Pushed to the master branch with commit
71d3521541d08942d6088892ca6d9eac1f6b0ddc.  Thank you!

-- 
Ricardo

[bug#31519] [PATCH 08/21] gnu: emacs-fish-completion: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-fish-completion): New variable.
---
 gnu/packages/emacs.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index d8e8f6a34..82f250f34 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -106,6 +106,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages password-utils)
   #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages shells)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match))
@@ -10649,3 +10650,37 @@ defaults.")
 - calendar (date selection) support
 - agenda support")
     (license license:gpl3+)))
+
+(define-public emacs-fish-completion
+  (package
+    (name "emacs-fish-completion")
+    (version "20180329.2137")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/fish-completion-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "02fpxdvvpx6zdfmji6x61bsr4dw9x49wgxkla75i1yp1pqhmbjgp"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("fish" ,fish)))
+    (home-page
+     "https://github.com/Ambrevar/emacs-fish-completion")
+    (synopsis
+     "Add fish completion to pcomplete (shell and Eshell)")
+    (description
+     "You can setup this package globally with:
+@code{(when (and (executable-find \"fish\")
+           (require 'fish-completion nil t))
+  (global-fish-completion-mode))}
+
+Alternatively, you can call the @code{fish-completion-mode} manually or in shell /
+Eshell mode hook.
+
+The package @code{emacs-bash-completion} is an optional dependency: if available,
+@code{fish-completion-complete} can be configured to fall back on bash to further
+try completing.  See @code{fish-completion-fallback-on-bash-p}.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31519] [PATCH 08/21] gnu: Add emacs-fish-completion.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-fish-completion): New variable.
---
 gnu/packages/emacs.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ba48cea78..303d0dcab 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -107,6 +107,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages password-utils)
   #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages shells)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match))
@@ -10741,3 +10742,37 @@ Org-mode.  It features:
 @item agenda support.
 @end itemize\n")
       (license license:gpl3+))))
+
+(define-public emacs-fish-completion
+  (package
+    (name "emacs-fish-completion")
+    (version "20180329")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/Ambrevar/emacs-fish-completion/archive/"
+             "3e3ed1f19fa778b7c35ad88e033dce5a6b1fc153"
+             ".tar.gz"))
+       (sha256
+        (base32
+         "16329py7fvid0bap1qhqxhdc68m9qqy1p8gc2bhng81zhm5a5zsm"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("fish" ,fish)))
+    (home-page
+     "https://github.com/Ambrevar/emacs-fish-completion")
+    (synopsis
+     "Add fish completion to pcomplete (shell and Eshell)")
+    (description
+     "You can setup this package globally with:
+@code{(when (and (executable-find \"fish\")
+           (require 'fish-completion nil t))
+  (global-fish-completion-mode))}
+
+Alternatively, you can call the @code{fish-completion-mode} manually or in shell /
+Eshell mode hook.
+
+The package @code{emacs-bash-completion} is an optional dependency: if available,
+@code{fish-completion-complete} can be configured to fall back on bash to further
+try completing.  See @code{fish-completion-fallback-on-bash-p}.")
+    (license license:gpl3+)))
-- 
2.17.0

bug#31519: [PATCH 08/21] gnu: Add emacs-fish-completion.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-fish-completion): New variable.

Applied.

[bug#31518] [PATCH 10/21] gnu: emacs-google-translate: New variable.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-google-translate): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6fb11a0a3..ce5f9bdb8 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10714,3 +10714,40 @@ A screenshot is taken for every user action.  Call
 @code{gif-screencast-stop} (<f9> by default) to finish recording and create
 the GIF result.")
     (license license:gpl3+)))
+
+(define-public emacs-google-translate
+  (package
+    (name "emacs-google-translate")
+    (version "20170713.119")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/google-translate-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "19v9xajksn0idq31jy3spcgajvqpab73bs2gcfgri2q882l0xyg0"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/atykhonov/google-translate")
+    (synopsis "Emacs interface to Google Translate")
+    (description
+     "Setup:
+@code{
+(require 'google-translate)
+(require 'google-translate-default-ui)
+(global-set-key \"\\C-ct\" 'google-translate-at-point)
+(global-set-key \"\\C-cT\" 'google-translate-query-translate)}
+
+or
+
+@code{(require 'google-translate)
+(require 'google-translate-smooth-ui)
+(global-set-key \"\\C-ct\" 'google-translate-smooth-translate)}
+
+The difference between these configurations is in UI which will be used:
+Default UI or Smooth UI.  Please read the source of
+@code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
+for more details.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31518] [PATCH 10/21] gnu: Add emacs-google-translate.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-google-translate): New variable.
---
 gnu/packages/emacs.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8484a31fe..577ef9f99 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10805,3 +10805,41 @@ A screenshot is taken for every user action.  Call
 @code{gif-screencast-stop} (<f9> by default) to finish recording and create
 the GIF result.")
     (license license:gpl3+)))
+
+(define-public emacs-google-translate
+  (let ((commit "d8b84a8359fcc697114d1298840e9a45b111c974"))
+    (package
+      (name "emacs-google-translate")
+      (version (git-version "0.11.14" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/atykhonov/google-translate")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/atykhonov/google-translate")
+      (synopsis "Emacs interface to Google Translate")
+      (description
+       "Setup:
+@code{
+(require 'google-translate)
+(require 'google-translate-default-ui)
+(global-set-key \"\\C-ct\" 'google-translate-at-point)
+(global-set-key \"\\C-cT\" 'google-translate-query-translate)}
+
+or
+
+@code{(require 'google-translate)
+(require 'google-translate-smooth-ui)
+(global-set-key \"\\C-ct\" 'google-translate-smooth-translate)}
+
+The difference between these configurations is in UI which will be used:
+Default UI or Smooth UI.  Please read the source of
+@code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
+for more details.")
+    (license license:gpl3+))))
-- 
2.17.0

bug#31518: [PATCH 10/21] gnu: Add emacs-google-translate.

[Ludovic Courtès]

Hi Pierre,

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-google-translate): New variable.

[...]

> +      (home-page "https://github.com/atykhonov/google-translate")
> +      (synopsis "Emacs interface to Google Translate")
> +      (description
> +       "Setup:
> +@code{
> +(require 'google-translate)
> +(require 'google-translate-default-ui)
> +(global-set-key \"\\C-ct\" 'google-translate-at-point)
> +(global-set-key \"\\C-cT\" 'google-translate-query-translate)}
> +
> +or
> +
> +@code{(require 'google-translate)
> +(require 'google-translate-smooth-ui)
> +(global-set-key \"\\C-ct\" 'google-translate-smooth-translate)}
> +
> +The difference between these configurations is in UI which will be used:
> +Default UI or Smooth UI.  Please read the source of
> +@code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
> +for more details.")
> +    (license license:gpl3+))))

Applied but I removed the documentation: I don’t think it’s the right
place to document the package.  Also, note that @code is for inline code
snippets; use @example for multi-line snippets.

Thanks,
Ludo’.

[bug#31500] [PATCH 01/20] gnu: Add emacs-esh-autosuggest.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-esh-autosuggest): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 24ab1ba6f..db4ff5652 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10489,3 +10489,32 @@ daemons (services) for those getting tired of typing out @code{sudo service
 my_thing reload} all the time.  It's offers a consistent UI over different
 init systems.")
     (license license:gpl3+)))
+
+(define-public emacs-esh-autosuggest
+  (package
+    (name "emacs-esh-autosuggest")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dieggsy/esh-autosuggest")
+             (commit version)))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-company" ,emacs-company)))
+    (home-page "https://github.com/dieggsy/esh-autosuggest")
+    (synopsis "Fish-like autosuggestions in Eshell")
+    (description
+     "This package assumes you use something other than company for eshell
+completion (e.g. @code{eshell-pcomplete}, @code{completion-at-point},
+@code{helm-esh-pcomplete}).  @code{company-mode} is used solely as a mechanism
+for history autosuggestions.
+
+Unless you're using @code{use-package}'s hook keyword, you can enable the
+autosuggestions with:
+@code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 02/20] gnu: Add emacs-evil-ediff.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-ediff): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index db4ff5652..c972c5dcd 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10518,3 +10518,27 @@ Unless you're using @code{use-package}'s hook keyword, you can enable the
 autosuggestions with:
 @code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}")
     (license license:gpl3+)))
+
+(define-public emacs-evil-ediff
+  (package
+    (name "emacs-evil-ediff")
+    (version "20170724.1223")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-ediff-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1sinr8r8iiimacr2szpz8ln32ngjar7ix8pvaiiz05i8g2xy7d57"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/emacs-evil/evil-ediff")
+    (synopsis "Make ediff a little evil")
+    (description
+     "Make ediff a little evil.  This configures ediff to be friendlier to
+users of vim-like keybindings.  Consult the help buffer for more
+information.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 03/20] gnu: Add emacs-evil-magit.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-magit): New variable.
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c972c5dcd..a4de61110 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10542,3 +10542,31 @@ autosuggestions with:
 users of vim-like keybindings.  Consult the help buffer for more
 information.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-magit
+  (package
+    (name "emacs-evil-magit")
+    (version "20180410.804")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-magit-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "19cfgsdlyjldwic5ff7104b7a21l206gmsddsr13w3b6974f4xik"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-evil" ,emacs-evil)
+       ("magit" ,magit)))
+    (home-page
+     "https://github.com/emacs-evil/evil-magit")
+    (synopsis "Evil-based key bindings for magit")
+    (description
+     "This library configures Magit and Evil to play well with each other.
+For some background see https://github.com/magit/evil-magit/issues See the
+README at https://github.com/justbur/evil-magit for a table describing the key
+binding changes.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 04/20] gnu: Add emacs-evil-mu4e.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-mu4e): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a4de61110..73226f9eb 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10570,3 +10570,27 @@ For some background see https://github.com/magit/evil-magit/issues See the
 README at https://github.com/justbur/evil-magit for a table describing the key
 binding changes.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-mu4e
+  (package
+    (name "emacs-evil-mu4e")
+    (version "20171127.1214")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-mu4e-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "17ssd1xgr8iwmgwpz53xbfmk6si3llh60s8jgqq5fnmxlp1v0iqq"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/JorisE/evil-mu4e")
+    (synopsis "Evil-based key bindings for mu4e")
+    (description
+     "Keybindings for mu4e that make sense for Evil users.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 05/20] gnu: Add emacs-evil-multiedit.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-multiedit): New variable.
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 73226f9eb..52c56b52a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10594,3 +10594,31 @@ binding changes.")
     (description
      "Keybindings for mu4e that make sense for Evil users.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-multiedit
+  (package
+    (name "emacs-evil-multiedit")
+    (version "20180209.1819")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-multiedit-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0l3hmhpib853rg6v65z5yvnl8zb7kamcspgifwnv5g000b6g2yxk"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-evil" ,emacs-evil)
+       ("emacs-iedit" ,emacs-iedit)))
+    (home-page
+     "https://github.com/hlissner/evil-multiedit")
+    (synopsis "Multiple cursors for Evil mode")
+    (description
+     "This plugin was an answer to the lack of proper multiple cursor support
+in Emacs+Evil.  It allows you to select and edit matches interactively,
+integrating @code{iedit-mode} into Evil mode with an attempt at sensible
+defaults.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 06/20] gnu: Add emacs-evil-org.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-org): New variable.
---
 gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 52c56b52a..4f89e1b82 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10622,3 +10622,33 @@ in Emacs+Evil.  It allows you to select and edit matches interactively,
 integrating @code{iedit-mode} into Evil mode with an attempt at sensible
 defaults.")
     (license license:gpl3+)))
+
+(define-public emacs-evil-org
+  (package
+    (name "emacs-evil-org")
+    (version "20180323.1606")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-org-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "06aindvpg8cv8ky4yylfp6z01l25n87rscfh1b1cw3nrgaiky7dn"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page
+     "https://github.com/Somelauw/evil-org-mode")
+    (synopsis "Evil keybindings for Org mode")
+    (description
+     "Supplemental Evil mode key-bindings to Emacs org-mode.  Features:
+- normal, visual and insert mode bindings
+- key bindings organised in key themes
+- operators like > and < to work on headings
+- text objects
+- table support
+- calendar (date selection) support
+- agenda support")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 07/20] gnu: Add emacs-fish-completion.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-fish-completion): New variable.
---
 gnu/packages/emacs.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4f89e1b82..65d550031 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -107,6 +107,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages password-utils)
   #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages shells)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match))
@@ -10652,3 +10653,37 @@ defaults.")
 - calendar (date selection) support
 - agenda support")
     (license license:gpl3+)))
+
+(define-public emacs-fish-completion
+  (package
+    (name "emacs-fish-completion")
+    (version "20180329.2137")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/fish-completion-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "02fpxdvvpx6zdfmji6x61bsr4dw9x49wgxkla75i1yp1pqhmbjgp"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("fish" ,fish)))
+    (home-page
+     "https://github.com/Ambrevar/emacs-fish-completion")
+    (synopsis
+     "Add fish completion to pcomplete (shell and Eshell)")
+    (description
+     "You can setup this package globally with:
+@code{(when (and (executable-find \"fish\")
+           (require 'fish-completion nil t))
+  (global-fish-completion-mode))}
+
+Alternatively, you can call the @code{fish-completion-mode} manually or in shell /
+Eshell mode hook.
+
+The package @code{emacs-bash-completion} is an optional dependency: if available,
+@code{fish-completion-complete} can be configured to fall back on bash to further
+try completing.  See @code{fish-completion-fallback-on-bash-p}.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 08/20] gnu: Add emacs-gif-screencast.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-gif-screencast): New variable.
---
 gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 65d550031..d546ee555 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10687,3 +10687,33 @@ The package @code{emacs-bash-completion} is an optional dependency: if available
 @code{fish-completion-complete} can be configured to fall back on bash to further
 try completing.  See @code{fish-completion-fallback-on-bash-p}.")
     (license license:gpl3+)))
+
+(define-public emacs-gif-screencast
+  (package
+    (name "emacs-gif-screencast")
+    (version "20180309.242")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/gif-screencast-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1xva240kx0w4x0x6cd42lyj87gi2i2s0fhpj3ca9klw9z5ffb55f"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("scrot" ,scrot)
+       ("imagemagick" ,imagemagick)
+       ;; ("gifsicle" ,gifsicle) ; TODO: Add gifsicle.
+       ))
+    (home-page
+     "https://github.com/ambrevar/emacs-gif-screencast")
+    (synopsis "One-frame-per-action GIF recording")
+    (description
+     "Call @code{gif-screencast} to start a recording.
+A screenshot is taken for every user action.  Call
+@code{gif-screencast-stop} (<f9> by default) to finish recording and create
+the GIF result.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 09/20] gnu: Add emacs-google-translate.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-google-translate): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index d546ee555..595be5bbf 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10717,3 +10717,40 @@ A screenshot is taken for every user action.  Call
 @code{gif-screencast-stop} (<f9> by default) to finish recording and create
 the GIF result.")
     (license license:gpl3+)))
+
+(define-public emacs-google-translate
+  (package
+    (name "emacs-google-translate")
+    (version "20170713.119")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/google-translate-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "19v9xajksn0idq31jy3spcgajvqpab73bs2gcfgri2q882l0xyg0"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/atykhonov/google-translate")
+    (synopsis "Emacs interface to Google Translate")
+    (description
+     "Setup:
+@code{
+(require 'google-translate)
+(require 'google-translate-default-ui)
+(global-set-key \"\\C-ct\" 'google-translate-at-point)
+(global-set-key \"\\C-cT\" 'google-translate-query-translate)}
+
+or
+
+@code{(require 'google-translate)
+(require 'google-translate-smooth-ui)
+(global-set-key \"\\C-ct\" 'google-translate-smooth-translate)}
+
+The difference between these configurations is in UI which will be used:
+Default UI or Smooth UI.  Please read the source of
+@code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
+for more details.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 10/20] gnu: Add emacs-helm-company.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-company): New variable.
---
 gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 595be5bbf..f68b280f0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10754,3 +10754,34 @@ Default UI or Smooth UI.  Please read the source of
 @code{google-translate-default-ui.el} and @code{google-translate-smooth-ui.el}
 for more details.")
     (license license:gpl3+)))
+
+(define-public emacs-helm-company
+  (package
+    (name "emacs-helm-company")
+    (version "20180213.1405")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-company-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "02b0s24rjjj36c95zrl2vysbh9pcx70rja0n7k0vys7n4hwwm648"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-company" ,emacs-company)))
+    (home-page
+     "https://github.com/Sodel-the-Vociferous/helm-company")
+    (synopsis "Helm interface for company-mode")
+    (description
+     "Add the following to your Emacs init file:
+@code{
+(autoload 'helm-company \"helm-company\") ;; Not necessary if using ELPA package
+(eval-after-load 'company
+  '(progn
+     (define-key company-mode-map (kbd \"C-:\") 'helm-company)
+     (define-key company-active-map (kbd \"C-:\") 'helm-company)))}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 11/20] gnu: Add emacs-helm-descbinds.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-descbinds): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index f68b280f0..fa1e64e06 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10785,3 +10785,32 @@ for more details.")
      (define-key company-mode-map (kbd \"C-:\") 'helm-company)
      (define-key company-active-map (kbd \"C-:\") 'helm-company)))}")
     (license license:gpl3+)))
+
+(define-public emacs-helm-descbinds
+  (package
+    (name "emacs-helm-descbinds")
+    (version "20180429.756")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-descbinds-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0ibmxps9qmlri2m7dl05fkzm9v5mbvpqfddx713fkhzmgc3k0y33"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-descbinds")
+    (synopsis
+     "Convenient `describe-bindings' with `helm'")
+    (description
+     "This package is a replacement of @code{describe-bindings} for Helm.
+@code{describe-bindings} is replaced with @code{helm-descbinds}.  As usual,
+type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
+@code{helm-descbinds}.  The bindings are presented in a similar way as
+`describe-bindings ' does, but you can use completion to find the command you
+searched for and execute it, or view it's documentation.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 12/20] gnu: Add emacs-helm-emms.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-emms): New variable.
---
 gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fa1e64e06..0bcf28046 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10814,3 +10814,28 @@ type @code{C-h b}, or any incomplete key sequence plus @code{C-h}, to run
 `describe-bindings ' does, but you can use completion to find the command you
 searched for and execute it, or view it's documentation.")
     (license license:gpl3+)))
+
+(define-public emacs-helm-emms
+  (package
+    (name "emacs-helm-emms")
+    (version "20180405.2228")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-emms-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "14af641kjbvfk0c1k2xjfh6jb2cs7zw256mayrik2ddjysx9jyg5"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-emms" ,emms)))
+    (home-page
+     "https://github.com/emacs-helm/helm-emms")
+    (synopsis "Emms for Helm")
+    (description "Helm interface for Emms to browse all tracks and all folders
+from @code{emms-source-file-default-directory}.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 13/20] gnu: Add emacs-helm-exwm.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-exwm): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0bcf28046..b3593e524 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10839,3 +10839,40 @@ searched for and execute it, or view it's documentation.")
     (description "Helm interface for Emms to browse all tracks and all folders
 from @code{emms-source-file-default-directory}.")
     (license license:gpl3+)))
+
+(define-public emacs-helm-exwm
+  (package
+    (name "emacs-helm-exwm")
+    (version "20180301.958")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-exwm-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "00hm42mkjradg45j6q4w8kzbjg1kylka39vazs1b9wjm82ppnsdh"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-exwm" ,emacs-exwm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-exwm")
+    (synopsis "Helm for EXWM buffers")
+    (description
+     "@code{helm-exwm} runs a Helm session over the list of EXWM buffers.
+To separate EXWM buffers from Emacs buffers in @code{helm-mini}, set up the sources as follows:
+@code{
+  (setq helm-exwm-emacs-buffers-source (helm-exwm-build-emacs-buffers-source))
+  (setq helm-exwm-source (helm-exwm-build-source))
+  (setq helm-mini-default-sources `(helm-exwm-emacs-buffers-source
+                                    helm-exwm-source
+                                    helm-source-recentf)
+}
+@code{helm-exwm-switch} is a convenience X application launcher using Helm to
+switch between the various windows of one or several specific applications.
+See @code{helm-exwm-switch-browser} for an example.
+")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 14/20] gnu: Add emacs-helm-flycheck.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-flycheck): New variable.
---
 gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b3593e524..9b2c2d997 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10876,3 +10876,34 @@ switch between the various windows of one or several specific applications.
 See @code{helm-exwm-switch-browser} for an example.
 ")
     (license license:gpl3+)))
+
+(define-public emacs-helm-flycheck
+  (package
+    (name "emacs-helm-flycheck")
+    (version "20160710.129")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-flycheck-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "157yf5xk6wy1li06ifk0mp6iw4yb0ny3h2mrna3m1zsi3anj1pzh"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-flycheck" ,flycheck)
+       ("emacs-helm" ,emacs-helm)))
+    (home-page
+     "https://github.com/yasuyk/helm-flycheck")
+    (synopsis "Show flycheck errors with Helm")
+    (description
+     "Add the following to your Emacs init file:
+@code{
+(require 'helm-flycheck) ;; Not necessary if using ELPA package
+(eval-after-load 'flycheck
+  '(define-key flycheck-mode-map (kbd \"C-c ! h\") 'helm-flycheck))
+}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 15/20] gnu: Add emacs-helm-ls-git.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-ls-git): New variable.
---
 gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9b2c2d997..1b8d7cce3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10907,3 +10907,36 @@ See @code{helm-exwm-switch-browser} for an example.
   '(define-key flycheck-mode-map (kbd \"C-c ! h\") 'helm-flycheck))
 }")
     (license license:gpl3+)))
+
+(define-public emacs-helm-ls-git
+  (package
+    (name "emacs-helm-ls-git")
+    (version "20180426.1126")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-ls-git-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "04sphfw7izcqw7jzrrda9sq0c2j65qrky2gqqaz3bc92qd9wky3m"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+    (home-page "https://github.com/emacs-helm/helm-ls-git")
+    (synopsis "Yet another Helm for listing the files in a git repo")
+    (description
+     "Features:
+- Display the open buffers in project.
+- Display a status source showing state of project (modified files etc...).
+- Display a list of all files in project under git control.
+- Allow looking quickly at diff on modified files.
+- Allow switching to git status with your prefered frontend (vc-dir, magit,etc...)
+- Full integration of git-grep, allow also usage of helm-grep (you can use
+ack-grep instead of grep).
+- Integrate usage of gid from id-utils.
+- Full integration with helm-find-files, allow you to browse project unrelated
+to current-buffer.
+- In addition, all actions of type files and buffers are provided. ")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 16/20] gnu: Add emacs-helm-mu.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-mu): New variable.
---
 gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1b8d7cce3..18fce21fc 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10940,3 +10940,32 @@ ack-grep instead of grep).
 to current-buffer.
 - In addition, all actions of type files and buffers are provided. ")
     (license license:gpl3+)))
+
+(define-public emacs-helm-mu
+  (package
+    (name "emacs-helm-mu")
+    (version "20180513.221")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-mu-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1l545nr6ifdgmxriw5pqlsqzw9ww0x1f32wpl1ziwyb672h9r5aj"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-helm" ,emacs-helm)))
+    (home-page
+     "https://github.com/emacs-helm/helm-mu")
+    (synopsis
+     "Helm sources for searching emails and contacts")
+    (description
+     "Helm sources for searching emails and contacts using @code{mu} and
+@code{mu4e}.  Mu is an indexer for maildirs and mu4e is a mutt-like MUA for
+Emacs build on top of mu.  Mu is highly efficient making it possible
+to get instant results even for huge maildirs.  It also provides
+search operators similar to Google Mail, e.g:
+@code{from:Peter to:Anne flag:attach search term}")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 17/20] gnu: Add emacs-helm-pass.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-helm-pass): New variable.
---
 gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 18fce21fc..981731bd9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10969,3 +10969,35 @@ to get instant results even for huge maildirs.  It also provides
 search operators similar to Google Mail, e.g:
 @code{from:Peter to:Anne flag:attach search term}")
     (license license:gpl3+)))
+
+(define-public emacs-helm-pass
+  (package
+    (name "emacs-helm-pass")
+    (version "20180415.2038")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/helm-pass-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1pwf05h29mrn05y7fhznwn0czl7ixynkvmy1fxljj45qdq2r6n8v"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-password-store" ,emacs-password-store)))
+    ;; TODO: Need auth-source-pass with Emacs<26?
+    (home-page
+     "https://github.com/jabranham/helm-pass")
+    (synopsis
+     "Helm interface of pass, the standard Unix password manager")
+    (description
+     "Users of @code{helm-pass} may also be interested in functionality
+provided by other Emacs packages dealing with pass:
+- @code{emacs-password-store}, which @code{helm-pass} relies on.
+- @code{emacs-pass}, a major mode for @code{pass}.
+- @code{auth-source-pass.el}: integration of Emacs' auth-source with
+@code{pass}, included in Emacs 26+).")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 18/20] gnu: Add emacs-image+.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-image+): New variable.
---
 gnu/packages/emacs.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 981731bd9..fbfc391f0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11001,3 +11001,41 @@ provided by other Emacs packages dealing with pass:
 - @code{auth-source-pass.el}: integration of Emacs' auth-source with
 @code{pass}, included in Emacs 26+).")
     (license license:gpl3+)))
+
+(define-public emacs-image+
+  (package
+    (name "emacs-image+")
+    (version "20150707.916")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/image+-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0lbgqc9n2ard9nrsk9ri2jazk8l6dv2hrmi83dvsm14kfnnajdil"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("imagemagick" ,imagemagick)))
+    (home-page
+     "https://github.com/mhayashi1120/Emacs-imagex")
+    (synopsis
+     "Image manipulate extensions for Emacs")
+    (description
+     "Type @code{C-x C-l +} to zoom-in the current image.
+You can zoom-out with type @code{-}.
+To manipulate a image under cursor: @code{M-x imagex-sticky-mode}.
+Or to activate globally: @code{M-x imagex-global-sticky-mode}.
+Or in .emacs: @code{(eval-after-load 'image+ '(imagex-global-sticky-mode 1))}.
+
+- @code{C-c +} / `C-c -`: Zoom in/out image.
+- @code{C-c M-m}: Adjust image to current frame size.
+- @code{C-c C-x C-s}: Save current image.
+- @code{C-c M-r} / @code{C-c M-l}: Rotate image.
+- @code{C-c M-o}: Show image @code{image+} have not modified.
+
+Adjusted image when open image file: @code{M-x imagex-auto-adjust-mode}.
+Or in .emacs: @code{(eval-after-load 'image+ '(imagex-auto-adjust-mode 1))}.
+If you do not want error message in minibuffer: @code{(setq imagex-quiet-error t)}.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 19/20] gnu: Add emacs-package-lint.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-package-lint): New variable.
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fbfc391f0..7f502022f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11039,3 +11039,29 @@ Adjusted image when open image file: @code{M-x imagex-auto-adjust-mode}.
 Or in .emacs: @code{(eval-after-load 'image+ '(imagex-auto-adjust-mode 1))}.
 If you do not want error message in minibuffer: @code{(setq imagex-quiet-error t)}.")
     (license license:gpl3+)))
+
+(define-public emacs-package-lint
+  (package
+    (name "emacs-package-lint")
+    (version "20180505.1828")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/package-lint-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "0ahaipd49c4jhsjmrh35ck03g4sq37zms372w7ip1y4425qscnbp"))))
+    (build-system emacs-build-system)
+    (home-page
+     "https://github.com/purcell/package-lint")
+    (synopsis
+     "Linting library for elisp package authors")
+    (description
+     "Provides a list of issues with the package metadata of a file,
+e.g. the package dependencies it requires.  See function
+@code{package-lint-buffer}.  Checks will currently be enabled only if a
+\"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 20/20] gnu: Add Add emacs-wgrep-helm.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-wgrep-helm).
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7f502022f..ed3ab8e2b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11065,3 +11065,29 @@ e.g. the package dependencies it requires.  See function
 @code{package-lint-buffer}.  Checks will currently be enabled only if a
 \"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
     (license license:gpl3+)))
+
+(define-public emacs-wgrep-helm
+  (package
+    (name "emacs-wgrep-helm")
+    (version "20170510.1539")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/wgrep-helm-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0yaf976nvidwrkmflhrg2arhnrz7kn4fk2dk68082dk26ra74a0n"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-wgrep" ,emacs-wgrep)))
+    (home-page
+     "https://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep-helm.el")
+    (synopsis
+     "Writable helm-grep-mode buffer and apply the changes to files")
+    (description
+     "@code{wgrep-helm} allows you to edit a @code{helm-grep-mode} buffer and
+apply those changes to the file buffer.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 20/20] gnu: Add Add emacs-wgrep-helm.

[Clément Lassieur]

Pierre Neidhardt <ambrevar@gmail.com> writes:

> * gnu/packages/emacs.scm (emacs-wgrep-helm).
   here you forgot ': New variable' :-)  ---^
                                             

> ---
>  gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 7f502022f..ed3ab8e2b 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -11065,3 +11065,29 @@ e.g. the package dependencies it requires.  See function
>  @code{package-lint-buffer}.  Checks will currently be enabled only if a
>  \"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
>      (license license:gpl3+)))
> +
> +(define-public emacs-wgrep-helm
> +  (package
> +    (name "emacs-wgrep-helm")
> +    (version "20170510.1539")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://melpa.org/packages/wgrep-helm-"
> +             version
> +             ".el"))
> +       (sha256
> +        (base32
> +         "0yaf976nvidwrkmflhrg2arhnrz7kn4fk2dk68082dk26ra74a0n"))))
> +    (build-system emacs-build-system)
> +    (propagated-inputs
> +     `(("emacs-wgrep" ,emacs-wgrep)))
> +    (home-page
> +     "https://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep-helm.el")
> +    (synopsis
> +     "Writable helm-grep-mode buffer and apply the changes to files")
> +    (description
> +     "@code{wgrep-helm} allows you to edit a @code{helm-grep-mode} buffer and
> +apply those changes to the file buffer.")
> +    (license license:gpl3+)))

[bug#31553] [PATCH 20/20] gnu: Add Add emacs-wgrep-helm.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-wgrep-helm): New variable.
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7f502022f..ed3ab8e2b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11065,3 +11065,29 @@ e.g. the package dependencies it requires.  See function
 @code{package-lint-buffer}.  Checks will currently be enabled only if a
 \"Package-Requires:\" or \"Package-Version:\" header is present in the file. ")
     (license license:gpl3+)))
+
+(define-public emacs-wgrep-helm
+  (package
+    (name "emacs-wgrep-helm")
+    (version "20170510.1539")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/wgrep-helm-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "0yaf976nvidwrkmflhrg2arhnrz7kn4fk2dk68082dk26ra74a0n"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-wgrep" ,emacs-wgrep)))
+    (home-page
+     "https://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep-helm.el")
+    (synopsis
+     "Writable helm-grep-mode buffer and apply the changes to files")
+    (description
+     "@code{wgrep-helm} allows you to edit a @code{helm-grep-mode} buffer and
+apply those changes to the file buffer.")
+    (license license:gpl3+)))
-- 
2.17.0

[bug#31500] [PATCH 19/21] gnu: Add emacs-image+.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-image+): New variable.
---
 gnu/packages/emacs.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3308412a7..1eff953ce 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -11100,3 +11100,44 @@ provided by other Emacs packages dealing with pass:
 @code{pass}, included in Emacs 26+).
 @end itemize\n")
     (license license:gpl3+)))
+
+(define-public emacs-image+
+  (let ((commit "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc"))
+    (package
+      (name "emacs-image+")
+      (version (git-version "0.6.2" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mhayashi1120/Emacs-imagex")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("imagemagick" ,imagemagick)))
+      (home-page
+       "https://github.com/mhayashi1120/Emacs-imagex")
+      (synopsis
+       "Image manipulate extensions for Emacs")
+      (description
+       "Type @code{C-x C-l +} to zoom-in the current image.
+You can zoom-out with type @code{-}.
+To manipulate a image under cursor: @code{M-x imagex-sticky-mode}.
+Or to activate globally: @code{M-x imagex-global-sticky-mode}.
+Or in .emacs: @code{(eval-after-load 'image+ '(imagex-global-sticky-mode 1))}.
+
+@itemize
+@item @code{C-c +} / `C-c -`: Zoom in/out image.
+@item @code{C-c M-m}: Adjust image to current frame size.
+@item @code{C-c C-x C-s}: Save current image.
+@item @code{C-c M-r} / @code{C-c M-l}: Rotate image.
+@item @code{C-c M-o}: Show image @code{image+} have not modified.
+@end itemize
+
+Adjusted image when open image file: @code{M-x imagex-auto-adjust-mode}.
+Or in .emacs: @code{(eval-after-load 'image+ '(imagex-auto-adjust-mode 1))}.
+If you do not want error message in minibuffer: @code{(setq imagex-quiet-error t)}.")
+    (license license:gpl3+))))
-- 
2.17.0

bug#31500: [PATCH 19/21] gnu: Add emacs-image+.

[Ludovic Courtès]

Pierre Neidhardt <ambrevar@gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-image+): New variable.

Applied with a modified description.