[bug#35467] [PATCH] Update Emacs packages

[bug#35467] [PATCH] Update Emacs packages

[Brian Leung]

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

See attached.

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

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

From 03a9c71915e39a7b918465dcad3cdaa3541590a5 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 28 Apr 2019 01:37:36 +0200
Subject: [PATCH 2/5] gnu: emacs-avy: Update to 4d52b5.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 79e46672eb..b76794acc8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4248,23 +4248,27 @@ show icons as well.")
     (license license:gpl3+)))
 
 (define-public emacs-avy
-  (package
-    (name "emacs-avy")
-    (version "0.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/abo-abo/avy.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/abo-abo/avy")
-    (synopsis "Tree-based completion for Emacs")
-    (description
-     "This package provides a generic completion method based on building a
+  ;; Last release version was from 2016.
+  (let ((commit "4d52b5cb7e1c565ca8dfe9c47b54330fd1a395bc")
+        (version "0.4.0")
+        (revision "1"))
+    (package
+      (name "emacs-avy")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/abo-abo/avy.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "13226jg9ndlnlvy73847rinn8wpx94jw42cj3pp84qplys9zfr2y"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/abo-abo/avy")
+      (synopsis "Tree-based completion for Emacs")
+      (description
+       "This package provides a generic completion method based on building a
 balanced decision tree with each candidate being a leaf.  To traverse the tree
 from the root to a desired leaf, typically a sequence of @code{read-key} can
 be used.
@@ -4274,7 +4278,7 @@ appropriately, with a character at each branch node.  So this completion
 method works only for things that you can see on your screen, all at once,
 such as the positions of characters, words, line beginnings, links, or
 windows.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-ace-window
   (package
-- 
2.21.0


[-- Attachment #3: 0001-gnu-emacs-hl-todo-Update-to-3.0.0.patch --]
[-- Type: text/x-patch, Size: 1632 bytes --]

From e790ecaf934fab6f5e65bc3567a34b55f6d55426 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 28 Apr 2019 01:36:54 +0200
Subject: [PATCH 1/5] gnu: emacs-hl-todo: Update to 3.0.0.

* gnu/packages/emacs-xyz.scm (emacs-hl-todo): Update to 3.0.0.
---
 gnu/packages/emacs-xyz.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 13a4c68ace..79e46672eb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3903,16 +3903,16 @@ regardless of @code{highlight-symbol-idle-delay}.
 (define-public emacs-hl-todo
   (package
     (name "emacs-hl-todo")
-    (version "1.9.0")
+    (version "3.0.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://raw.githubusercontent.com/tarsius/hl-todo/"
-                    version "/hl-todo.el"))
-              (file-name (string-append "hl-todo-" version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/tarsius/hl-todo")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0728givzh7xv5i88ac9if8byj1p8bilrj1fnizca10s0rv100hdr"))))
+                "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tarsius/hl-todo")
     (synopsis "Emacs mode to highlight TODO and similar keywords")
-- 
2.21.0


[-- Attachment #4: 0004-gnu-emacs-elfeed-Update-to-3.1.0.patch --]
[-- Type: text/x-patch, Size: 1224 bytes --]

From ae46da81633fedad99a39a3266b30d1dd67f2310 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 28 Apr 2019 01:40:05 +0200
Subject: [PATCH 4/5] gnu: emacs-elfeed: Update to 3.1.0.

* gnu/packages/emacs-xyz.scm (emacs-elfeed): Update to 3.1.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 1e10343279..517a3d575f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4883,7 +4883,7 @@ If you want to mark a folder manually as a project just create an empty
 (define-public emacs-elfeed
   (package
     (name "emacs-elfeed")
-    (version "3.0.0")
+    (version "3.1.0")
     (source
      (origin
        (method git-fetch)
@@ -4892,7 +4892,7 @@ If you want to mark a folder manually as a project just create an empty
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi"))))
+        (base32 "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-- 
2.21.0


[-- Attachment #5: 0003-gnu-emacs-highlight-symbol-Update-to-7a789c.patch --]
[-- Type: text/x-patch, Size: 2669 bytes --]

From 5c4af8e9e1e1074bf1e71e9b4be2973fab874ca2 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 28 Apr 2019 01:39:21 +0200
Subject: [PATCH 3/5] gnu: emacs-highlight-symbol: Update to 7a789c.

* gnu/packages/emacs-xyz.scm (emacs-highlight-symbol): Update to 7a789c.
---
 gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b76794acc8..1e10343279 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3869,23 +3869,26 @@ 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
+  (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.
 
@@ -3898,7 +3901,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


[-- Attachment #6: 0005-gnu-emacs-evil-nerd-commenter-Update-to-3.3.7.patch --]
[-- Type: text/x-patch, Size: 1293 bytes --]

From 93c8d0199962142d28aa668e7faa2262492e4ffe Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 28 Apr 2019 01:40:28 +0200
Subject: [PATCH 5/5] gnu: emacs-evil-nerd-commenter: Update to 3.3.7.

* gnu/packages/emacs-xyz.scm (emacs-evil-nerd-commenter): Update to 3.3.7.
---
 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 517a3d575f..7ca4c00ae0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5848,7 +5848,7 @@ pasting into and from @code{tmux} paste buffers.")
 (define-public emacs-evil-nerd-commenter
   (package
     (name "emacs-evil-nerd-commenter")
-    (version "3.3.6")
+    (version "3.3.7")
     (source
      (origin
        (method git-fetch)
@@ -5858,7 +5858,7 @@ pasting into and from @code{tmux} paste buffers.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0074i9lvfs5hkbf63g1xh3n7dbmkax30bppkx2cd394c7zlsvzzk"))))
+         "1r8shfdddys9vqvrxf7s6z83ydqx9xhqs9sa7klbsajryqcp50b7"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-evil" ,emacs-evil)))
     (home-page "https://github.com/redguardtoo/evil-nerd-commenter")
-- 
2.21.0

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

[Brian Leung]

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

I forgot to lint, so I'm resubmitting these patches.

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

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

From 33143aad9c52949e7bb14a23d32425461345e202 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 5 May 2019 02:30:38 +0200
Subject: [PATCH 1/5] gnu: emacs-highlight-symbol: Update to 7a789c7.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 367f46f264..0ca87ecadc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3894,23 +3894,26 @@ 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
+  (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.
 
@@ -3923,7 +3926,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


[-- Attachment #3: 0003-gnu-emacs-avy-Update-to-4d52b5c.patch --]
[-- Type: text/x-patch, Size: 2647 bytes --]

From 3b2a37c3a41215295a6f37478c4fbbe2ef230ead Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 5 May 2019 02:31:22 +0200
Subject: [PATCH 3/5] gnu: emacs-avy: Update to 4d52b5c.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 241a56cea7..9272f67fe5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4276,23 +4276,27 @@ show icons as well.")
     (license license:gpl3+)))
 
 (define-public emacs-avy
-  (package
-    (name "emacs-avy")
-    (version "0.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/abo-abo/avy.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/abo-abo/avy")
-    (synopsis "Tree-based completion for Emacs")
-    (description
-     "This package provides a generic completion method based on building a
+  ;; Last release version was from 2016.
+  (let ((commit "4d52b5cb7e1c565ca8dfe9c47b54330fd1a395bc")
+        (version "0.4.0")
+        (revision "1"))
+    (package
+      (name "emacs-avy")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/abo-abo/avy.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "13226jg9ndlnlvy73847rinn8wpx94jw42cj3pp84qplys9zfr2y"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/abo-abo/avy")
+      (synopsis "Tree-based completion for Emacs")
+      (description
+       "This package provides a generic completion method based on building a
 balanced decision tree with each candidate being a leaf.  To traverse the tree
 from the root to a desired leaf, typically a sequence of @code{read-key} can
 be used.
@@ -4302,7 +4306,7 @@ appropriately, with a character at each branch node.  So this completion
 method works only for things that you can see on your screen, all at once,
 such as the positions of characters, words, line beginnings, links, or
 windows.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-ace-window
   (package
-- 
2.21.0


[-- Attachment #4: 0005-gnu-emacs-evil-nerd-commenter-Update-to-3.3.7.patch --]
[-- Type: text/x-patch, Size: 1292 bytes --]

From 53108f9aeb329786174c18d569513bb3341dd370 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 5 May 2019 02:32:10 +0200
Subject: [PATCH 5/5] gnu: emacs-evil-nerd-commenter: Update to 3.3.7.

* gnu/packages/emacs-xyz.scm (emacs-evil-nerd-commenter): Update to 3.3.7.
---
 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 58f65640ec..b5b36f224a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5873,7 +5873,7 @@ pasting into and from @code{tmux} paste buffers.")
 (define-public emacs-evil-nerd-commenter
   (package
     (name "emacs-evil-nerd-commenter")
-    (version "3.3.6")
+    (version "3.3.7")
     (source
      (origin
        (method git-fetch)
@@ -5883,7 +5883,7 @@ pasting into and from @code{tmux} paste buffers.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0074i9lvfs5hkbf63g1xh3n7dbmkax30bppkx2cd394c7zlsvzzk"))))
+         "1r8shfdddys9vqvrxf7s6z83ydqx9xhqs9sa7klbsajryqcp50b7"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-evil" ,emacs-evil)))
     (home-page "https://github.com/redguardtoo/evil-nerd-commenter")
-- 
2.21.0


[-- Attachment #5: 0002-gnu-emacs-hl-todo-Update-to-3.0.0.patch --]
[-- Type: text/x-patch, Size: 1631 bytes --]

From bf4d6812133000df2fc2dc7889026ac59830f435 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 5 May 2019 02:31:02 +0200
Subject: [PATCH 2/5] gnu: emacs-hl-todo: Update to 3.0.0.

* gnu/packages/emacs-xyz.scm (emacs-hl-todo): Update to 3.0.0.
---
 gnu/packages/emacs-xyz.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0ca87ecadc..241a56cea7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3931,16 +3931,16 @@ regardless of @code{highlight-symbol-idle-delay}.
 (define-public emacs-hl-todo
   (package
     (name "emacs-hl-todo")
-    (version "1.9.0")
+    (version "3.0.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://raw.githubusercontent.com/tarsius/hl-todo/"
-                    version "/hl-todo.el"))
-              (file-name (string-append "hl-todo-" version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/tarsius/hl-todo")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0728givzh7xv5i88ac9if8byj1p8bilrj1fnizca10s0rv100hdr"))))
+                "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tarsius/hl-todo")
     (synopsis "Emacs mode to highlight TODO and similar keywords")
-- 
2.21.0


[-- Attachment #6: 0004-gnu-emacs-elfeed-Update-to-3.1.0.patch --]
[-- Type: text/x-patch, Size: 1223 bytes --]

From 563a4d0bf048871d4de7019fbacbb9534d54c849 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 5 May 2019 02:32:01 +0200
Subject: [PATCH 4/5] gnu: emacs-elfeed: Update to 3.1.0.

* gnu/packages/emacs-xyz.scm (emacs-elfeed): Update to 3.1.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 9272f67fe5..58f65640ec 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4908,7 +4908,7 @@ If you want to mark a folder manually as a project just create an empty
 (define-public emacs-elfeed
   (package
     (name "emacs-elfeed")
-    (version "3.0.0")
+    (version "3.1.0")
     (source
      (origin
        (method git-fetch)
@@ -4917,7 +4917,7 @@ If you want to mark a folder manually as a project just create an empty
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi"))))
+        (base32 "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-- 
2.21.0

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

[Ricardo Wurmus]

Hi Brian,

thank you for these patches.

I have applied these files:

  0002-gnu-emacs-hl-todo-Update-to-3.0.0.patch
  0004-gnu-emacs-elfeed-Update-to-3.1.0.patch
  0005-gnu-emacs-evil-nerd-commenter-Update-to-3.3.7.patch

The other two patches update packages to unreleased versions, which we
usually avoid unless there’s a very good reason to pick a version
mid-release.

Could you tell us why the upgrades to emacs-highlight-symbol and
emacs-avy are needed?

--
Ricardo

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

[Brian Leung]

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

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: 2943 bytes --]

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

From 8db69eee7658e746131ac36173950f0e1b2e69f7 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/2] 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 2ba9108f37..0181162ab3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4072,23 +4072,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.
 
@@ -4101,7 +4107,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


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

From 27cef903b5afa10e1e3457887ae25f9e6e347e79 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/2] 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 0181162ab3..1986c10eae 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4459,7 +4459,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)
@@ -4468,7 +4468,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

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

[Brian Leung]

[-- 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

bug#35467: [PATCH] Update Emacs packages.

[Ricardo Wurmus]

Hi Brian,

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

Thanks, I’ve pushed them with commit 7547648.

Note: there was a mistake in the version string for
emacs-highlight-symbol in the commit message, which I overlooked.  It
should have been 1.3-1.7a789c7, not 1.3.1-7a789c7.

--
Ricardo