[bug#35467] [PATCH] Update Emacs packages.

[Brian Leung <bkleung89@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 2031 bytes --]

I've added an update to emacs-lispy as well.

On Mon, May 20, 2019 at 5:28 PM Brian Leung <bkleung89@gmail.com> wrote:

> Friendly ping.
>
> On Tue, May 14, 2019 at 1:36 AM Brian Leung <bkleung89@gmail.com> wrote:
>
>> Hi Ricardo,
>>
>> OK, it looks like emacs-avy received a version bump two days ago. I've
>> modified the patches appropriately and rebased with Guix's latest master
>> branch.
>>
>> Best,
>> Brian
>>
>> On Mon, May 6, 2019 at 8:25 PM Brian Leung <bkleung89@gmail.com> wrote:
>>
>>> Hi Ricardo,
>>>
>>> OK, I've made your suggested changes.
>>>
>>> For future reference, is it possible to edit a past commit message with
>>> git fixup? I know how to edit the actual contents of past commits using git
>>> fixup, but not their commit messages. For these two patches, I had to
>>> manually make new commits.
>>>
>>> Best,
>>> Brian
>>>
>>> On Mon, May 6, 2019 at 7:02 PM Ricardo Wurmus <rekado@elephly.net>
>>> wrote:
>>>
>>>>
>>>> Hi Brian,
>>>>
>>>> > Thanks for your response. The release version of
>>>> emacs-highlight-symbol
>>>> > prints an occurrence count in the echo area upon hovering over a
>>>> symbol,
>>>> > which is annoying because it can drown out important messages from
>>>> (say)
>>>> > eldoc; this PR <https://github.com/nschum/highlight-symbol.el/pull/31
>>>> >,
>>>> > which is not included in the release version, fixes that. The last
>>>> release
>>>> > version of emacs-avy was from January 2016, and there have since been
>>>> > slightly over 100 commits since then for various features and bug
>>>> > fixes.
>>>>
>>>> I see.  It would be good to include this information as a comment so
>>>> that people looking at this in the future understand why it was done.
>>>>
>>>> Please also change the commit message to state the actual version and
>>>> not just a prefix of the commit hash.  Please use the version string
>>>> that would be used by Guix (something like “1.2.3-1.cabbage”).
>>>>
>>>> --
>>>> Ricardo
>>>>
>>>>

[-- Attachment #1.2: Type: text/html, Size: 3366 bytes --]

[-- Attachment #2: 0002-gnu-emacs-avy-Update-to-0.5.0.patch --]
[-- Type: text/x-patch, Size: 1176 bytes --]

From 8df5077790ab0737d306a4cd8305191f87e7e90c Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 14 May 2019 00:13:42 +0200
Subject: [PATCH 2/3] gnu: emacs-avy: Update to 0.5.0.

* gnu/packages/emacs-xyz.scm (emacs-avy): Update to 0.5.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b686582d62..ae2403dbcd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4461,7 +4461,7 @@ show icons as well.")
 (define-public emacs-avy
   (package
     (name "emacs-avy")
-    (version "0.4.0")
+    (version "0.5.0")
     (source
      (origin
        (method git-fetch)
@@ -4470,7 +4470,7 @@ show icons as well.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm"))))
+        (base32 "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/abo-abo/avy")
     (synopsis "Tree-based completion for Emacs")
-- 
2.21.0


[-- Attachment #3: 0003-gnu-emacs-lispy-Update-to-0.27.0.patch --]
[-- Type: text/x-patch, Size: 3143 bytes --]

From b6dc3dbe0ffe29bf99d01736f2dc9cb6c60250c9 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 25 May 2019 06:45:46 +0200
Subject: [PATCH 3/3] gnu: emacs-lispy: Update to 0.27.0.

* gnu/packages/emacs-xyz.scm (emacs-lispy): Update to 0.27.0.
---
 gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ae2403dbcd..9199b45e40 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4560,37 +4560,35 @@ navigate code in a tree-like fashion.")
       (license license:gpl3+))))
 
 (define-public emacs-lispy
-  ;; Release 0.26.0 was almost 3 years ago, and there have been ~772 commits
-  ;; since.
-  (let ((commit "f94cfc6b8f9c3afe7d028c366928049c011023de")
-        (revision "1"))
-    (package
-      (name "emacs-lispy")
-      (version (git-version "0.26.0" revision commit))
-      (home-page "https://github.com/abo-abo/lispy")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference (url home-page) (commit commit)))
-                (sha256
-                 (base32
-                  "1bm2cpwizg1qfpm377gpx1af1hm5maw69if1csnk5vwaphmv8c4g"))
-                (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       `(("emacs-ace-window" ,emacs-ace-window)
-         ("emacs-iedit" ,emacs-iedit)
-         ("emacs-ivy" ,emacs-ivy)
-         ("emacs-hydra" ,emacs-hydra)
-         ("emacs-zoutline" ,emacs-zoutline)))
-      (synopsis "Modal S-expression editing")
-      (description
-       "Due to the structure of Lisp syntax it's very rare for the programmer
+  (package
+    (name "emacs-lispy")
+    (version "0.27.0")
+    (home-page "https://github.com/abo-abo/lispy")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/abo-abo/lispy")
+                    (commit version)))
+              (sha256
+               (base32
+                "1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6"))
+              (file-name (git-file-name name version))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-ace-window" ,emacs-ace-window)
+       ("emacs-iedit" ,emacs-iedit)
+       ("emacs-ivy" ,emacs-ivy)
+       ("emacs-hydra" ,emacs-hydra)
+       ("emacs-zoutline" ,emacs-zoutline)))
+    (synopsis "Modal S-expression editing")
+    (description
+     "Due to the structure of Lisp syntax it's very rare for the programmer
 to want to insert characters right before \"(\" or right after \")\".  Thus
 unprefixed printable characters can be used to call commands when the point is
 at one of these special locations.  Lispy provides unprefixed keybindings for
 S-expression editing when point is at the beginning or end of an
 S-expression.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-lispyville
   (let ((commit "d28b937f0cabd8ce61e2020fe9a733ca80d82c74")
-- 
2.21.0


[-- Attachment #4: 0001-gnu-emacs-highlight-symbol-Update-to-1.3.1-7a789c7.patch --]
[-- Type: text/x-patch, Size: 2844 bytes --]

From 9c18d3d42a3754f440f593edc4fdfbb8606f263f Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 14 May 2019 00:12:49 +0200
Subject: [PATCH 1/3] gnu: emacs-highlight-symbol: Update to 1.3.1-7a789c7.

* gnu/packages/emacs-xyz.scm (emacs-highlight-symbol): Update to 1.3.1-7a789c7.
---
 gnu/packages/emacs-xyz.scm | 42 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index beb35c8122..b686582d62 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4074,23 +4074,29 @@ well as completely new features.")
     (license license:gpl3+)))
 
 (define-public emacs-highlight-symbol
-  (package
-    (name "emacs-highlight-symbol")
-    (version "1.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/nschum/highlight-symbol.el.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6"))))
-    (build-system emacs-build-system)
-    (home-page "https://nschum.de/src/emacs/highlight-symbol")
-    (synopsis "Automatic and manual symbol highlighting for Emacs")
-    (description
-     "Use @code{highlight-symbol} to toggle highlighting of the symbol at
+  ;; We prefer a more recent commit that provides an option to squelch
+  ;; echo-area alerts that can drown out useful information like eldoc
+  ;; messages.
+  (let ((commit "7a789c779648c55b16e43278e51be5898c121b3a")
+        (version "1.3")
+        (revision "1"))
+    (package
+      (name "emacs-highlight-symbol")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/nschum/highlight-symbol.el.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96"))))
+      (build-system emacs-build-system)
+      (home-page "https://nschum.de/src/emacs/highlight-symbol/")
+      (synopsis "Automatic and manual symbol highlighting for Emacs")
+      (description
+       "Use @code{highlight-symbol} to toggle highlighting of the symbol at
 point throughout the current buffer.  Use @code{highlight-symbol-mode} to keep
 the symbol at point highlighted.
 
@@ -4103,7 +4109,7 @@ bindings @code{M-p} and @code{M-p} for navigation.  When
 regardless of @code{highlight-symbol-idle-delay}.
 
 @code{highlight-symbol-query-replace} can be used to replace the symbol. ")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public emacs-hl-todo
   (package
-- 
2.21.0