unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#36778] [PATCH] Add and update Emacs packages.
@ 2019-07-24  3:55 Brian Leung
  2019-07-27  3:23 ` Brian Leung
  0 siblings, 1 reply; 7+ messages in thread
From: Brian Leung @ 2019-07-24  3:55 UTC (permalink / raw)
  To: 36778


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

See attached.

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

[-- Attachment #2: 0001-gnu-emacs-helm-Update-to-3.3.patch --]
[-- Type: text/x-patch, Size: 1157 bytes --]

From d99a7fc0b46e56fdb5cf057827c6953aa6d8eb6e Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:05:18 +0200
Subject: [PATCH 1/4] gnu: emacs-helm: Update to 3.3.

* gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.3.
---
 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 9baa782e2e..e8cd876afe 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5903,7 +5903,7 @@ ack, ag, helm and pt.")
 (define-public emacs-helm
   (package
     (name "emacs-helm")
-    (version "3.2")
+    (version "3.3")
     (source
      (origin
        (method git-fetch)
@@ -5912,7 +5912,7 @@ ack, ag, helm and pt.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12yyprpgh2by2pd41i4z9gz55fxg0f90x03bfrsf791xwbhf6931"))))
+        (base32 "0fqhw7r9fcsja5d3pgbipw7pkw9nj534faav6hi45413hc3gyv92"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
2.22.0


[-- Attachment #3: 0002-gnu-Add-emacs-evil-traces.patch --]
[-- Type: text/x-patch, Size: 1829 bytes --]

From 12719a4659eb0e33d704e002e62df2680d1a57bd Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:05:29 +0200
Subject: [PATCH 2/4] gnu: Add emacs-evil-traces.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e8cd876afe..ed3e620abc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16607,6 +16607,31 @@ provided.  Those alternative commands are and bound by default to their
 corresponding Evil keys.")
       (license license:expat))))
 
+(define-public emacs-evil-traces
+  (let ((commit "b41b7432b8110378c199a3d25af464083777f453")
+        (version "0.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-evil-traces")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/mamapanda/evil-traces.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0a15f2saynz9fws1h5s7py3cshsk4xs1kwgwj1m5rsin36g0j6hc"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/mamapanda/evil-traces")
+      (synopsis "Visual hints for @code{evil-ex}")
+      (description "This adds visual hints to certain @code{ex} commands in
+@code{evil-mode}.")
+      (license license:gpl3+))))
+
 (define-public emacs-xterm-color
   (let ((commit "a452ab38a7cfae97078062ff8885b5d74fd1e5a6")
         (version "1.8")
-- 
2.22.0


[-- Attachment #4: 0004-gnu-emacs-magit-todos-Update-to-1.3.patch --]
[-- Type: text/x-patch, Size: 1177 bytes --]

From 1ce0e45e01c70449a58389874491c4fcce5ef274 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 05:54:14 +0200
Subject: [PATCH 4/4] gnu: emacs-magit-todos: Update to 1.3.

* gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.3.
---
 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 5d46b4b19b..52383d0630 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14141,7 +14141,7 @@ buffers – other modes on the TODO list).
 (define-public emacs-magit-todos
   (package
     (name "emacs-magit-todos")
-    (version "1.2")
+    (version "1.3")
     (source
      (origin
        (method git-fetch)
@@ -14151,7 +14151,7 @@ buffers – other modes on the TODO list).
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "17a18gszbypz82bj36xbfyykc4s9rz83vwmpxvlf65svhd51c0nh"))))
+         "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
2.22.0


[-- Attachment #5: 0003-gnu-Add-emacs-scroll-on-drag.patch --]
[-- Type: text/x-patch, Size: 1705 bytes --]

From cac1e93c18b3be172e060b47fc7819c017266513 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:29:55 +0200
Subject: [PATCH 3/4] gnu: Add emacs-scroll-on-drag.

* gnu/packages/emacs-xyz.scm (emacs-scroll-on-drag): New variable.
---
 gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ed3e620abc..5d46b4b19b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12651,6 +12651,30 @@ When @code{gac-automatically-push-p} is non-nil, it also tries to push to
 the current upstream.")
     (license license:gpl3+)))
 
+(define-public emacs-scroll-on-drag
+  (let ((commit "e509c10ccdf6f4239d448da8aa6f8b9cc36bb340")
+        (version "0.1")
+        (revision "1"))
+    (package
+      (name "emacs-scroll-on-drag")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/ideasman42/emacs-scroll-on-drag.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00yy0bx874ijg8s16bp13n0w5q2fmjiklz0kgbwh4wpb7fawk8vv"))))
+      (build-system emacs-build-system)
+      (home-page "https://gitlab.com/ideasman42/emacs-scroll-on-drag")
+      (synopsis "Interactive scrolling")
+      (description "This package permits scrolling at increasing speeds based
+on drag distance.")
+      (license license:gpl3+))))
+
 (define-public emacs-company-restclient
   (package
     (name "emacs-company-restclient")
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#36778] [PATCH] Add and update Emacs packages.
  2019-07-24  3:55 [bug#36778] [PATCH] Add and update Emacs packages Brian Leung
@ 2019-07-27  3:23 ` Brian Leung
  2019-07-30  9:03   ` Brian Leung
  0 siblings, 1 reply; 7+ messages in thread
From: Brian Leung @ 2019-07-27  3:23 UTC (permalink / raw)
  To: 36778


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

I rebased and added a few additional patches.

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

[-- Attachment #2: 0003-gnu-Add-emacs-scroll-on-drag.patch --]
[-- Type: text/x-patch, Size: 1707 bytes --]

From 210a0651ee61504a9b0d3032d39ea589ad13cb6e Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:29:55 +0200
Subject: [PATCH 03/10] gnu: Add emacs-scroll-on-drag.

* gnu/packages/emacs-xyz.scm (emacs-scroll-on-drag): New variable.
---
 gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 14490833cb..a5215ef530 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12679,6 +12679,30 @@ When @code{gac-automatically-push-p} is non-nil, it also tries to push to
 the current upstream.")
     (license license:gpl3+)))
 
+(define-public emacs-scroll-on-drag
+  (let ((commit "e509c10ccdf6f4239d448da8aa6f8b9cc36bb340")
+        (version "0.1")
+        (revision "1"))
+    (package
+      (name "emacs-scroll-on-drag")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/ideasman42/emacs-scroll-on-drag.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00yy0bx874ijg8s16bp13n0w5q2fmjiklz0kgbwh4wpb7fawk8vv"))))
+      (build-system emacs-build-system)
+      (home-page "https://gitlab.com/ideasman42/emacs-scroll-on-drag")
+      (synopsis "Interactive scrolling")
+      (description "This package permits scrolling at increasing speeds based
+on drag distance.")
+      (license license:gpl3+))))
+
 (define-public emacs-company-restclient
   (package
     (name "emacs-company-restclient")
-- 
2.22.0


[-- Attachment #3: 0002-gnu-Add-emacs-evil-traces.patch --]
[-- Type: text/x-patch, Size: 1831 bytes --]

From 6ed981dc09ef870e033095a79b74cb65c4b9d8b2 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:05:29 +0200
Subject: [PATCH 02/10] gnu: Add emacs-evil-traces.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 33fcc9a108..14490833cb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16635,6 +16635,31 @@ provided.  Those alternative commands are and bound by default to their
 corresponding Evil keys.")
       (license license:expat))))
 
+(define-public emacs-evil-traces
+  (let ((commit "b41b7432b8110378c199a3d25af464083777f453")
+        (version "0.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-evil-traces")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/mamapanda/evil-traces.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0a15f2saynz9fws1h5s7py3cshsk4xs1kwgwj1m5rsin36g0j6hc"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/mamapanda/evil-traces")
+      (synopsis "Visual hints for @code{evil-ex}")
+      (description "This adds visual hints to certain @code{ex} commands in
+@code{evil-mode}.")
+      (license license:gpl3+))))
+
 (define-public emacs-xterm-color
   (let ((commit "a452ab38a7cfae97078062ff8885b5d74fd1e5a6")
         (version "1.8")
-- 
2.22.0


[-- Attachment #4: 0004-gnu-emacs-magit-todos-Update-to-1.3.patch --]
[-- Type: text/x-patch, Size: 1179 bytes --]

From 9dbf3be6049ca7f0e852b013aae23987f4853809 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 05:54:14 +0200
Subject: [PATCH 04/10] gnu: emacs-magit-todos: Update to 1.3.

* gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.3.
---
 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 a5215ef530..12ccb3f369 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14169,7 +14169,7 @@ buffers – other modes on the TODO list).
 (define-public emacs-magit-todos
   (package
     (name "emacs-magit-todos")
-    (version "1.2")
+    (version "1.3")
     (source
      (origin
        (method git-fetch)
@@ -14179,7 +14179,7 @@ buffers – other modes on the TODO list).
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "17a18gszbypz82bj36xbfyykc4s9rz83vwmpxvlf65svhd51c0nh"))))
+         "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
2.22.0


[-- Attachment #5: 0001-gnu-emacs-helm-Update-to-3.3.patch --]
[-- Type: text/x-patch, Size: 1159 bytes --]

From 82288de61756ab5f20f66d6ea973f95a04fb5cbc Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:05:18 +0200
Subject: [PATCH 01/10] gnu: emacs-helm: Update to 3.3.

* gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.3.
---
 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 314f4867b3..33fcc9a108 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5931,7 +5931,7 @@ ack, ag, helm and pt.")
 (define-public emacs-helm
   (package
     (name "emacs-helm")
-    (version "3.2")
+    (version "3.3")
     (source
      (origin
        (method git-fetch)
@@ -5940,7 +5940,7 @@ ack, ag, helm and pt.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12yyprpgh2by2pd41i4z9gz55fxg0f90x03bfrsf791xwbhf6931"))))
+        (base32 "0fqhw7r9fcsja5d3pgbipw7pkw9nj534faav6hi45413hc3gyv92"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
2.22.0


[-- Attachment #6: 0005-gnu-Add-emacs-helm-org-rifle.patch --]
[-- Type: text/x-patch, Size: 1684 bytes --]

From d3c2b530ae58d1b6548a62c70d13807a57073919 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Thu, 25 Jul 2019 00:03:59 +0200
Subject: [PATCH 05/10] gnu: Add emacs-helm-org-rifle.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 12ccb3f369..18edb58d87 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7159,6 +7159,32 @@ find files owned by packages...  And much more, including performing all the
 above over the network.")
       (license license:gpl3+))))
 
+(define-public emacs-helm-org-rifle
+  (package
+    (name "emacs-helm-org-rifle")
+    (version "1.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/alphapapa/helm-org-rifle")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1r38xhwvgbv6kn5x159phz3xgss7f1rc7icq27rnr4d8aj91wm6k"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-f" ,emacs-f)
+       ("emacs-helm" ,emacs-helm)
+       ("emacs-s" ,emacs-s)))
+    (home-page "https://github.com/alphapapa/helm-org-rifle")
+    (synopsis "Rifle through Org files")
+    (description "This package searches both headings and contents of entries
+in Org buffers and displays matching entries.")
+    (license license:gpl3+)))
+
 (define-public emacs-memoize
   (package
     (name "emacs-memoize")
-- 
2.22.0


[-- Attachment #7: 0006-gnu-Add-emacs-dired-toggle-sudo.patch --]
[-- Type: text/x-patch, Size: 4596 bytes --]

From 00d15729c28b5f8c9fd58a7be02ba98373d5db2f Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 01:00:50 +0200
Subject: [PATCH 06/10] gnu: Add emacs-dired-toggle-sudo.

* gnu/packages/emacs-xyz.scm (emacs-dired-toggle-sudo): New variable.
* gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/emacs-xyz.scm                    | 24 +++++++++
 .../emacs-dired-toggle-sudo-emacs-26.patch    | 49 +++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index bd509647dc..92fa4f37a9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -772,6 +772,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/elfutils-tests-ptrace.patch		\
   %D%/packages/patches/elixir-path-length.patch			\
   %D%/packages/patches/einstein-build.patch			\
+  %D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch   \
   %D%/packages/patches/emacs-exec-path.patch			\
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch	\
   %D%/packages/patches/emacs-json-reformat-fix-tests.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 18edb58d87..73a7668b08 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7185,6 +7185,30 @@ above over the network.")
 in Org buffers and displays matching entries.")
     (license license:gpl3+)))
 
+(define-public emacs-dired-toggle-sudo
+  (package
+    (name "emacs-dired-toggle-sudo")
+    (version "1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/renard/dired-toggle-sudo")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2"))
+       (patches
+        (search-patches
+         "emacs-dired-toggle-sudo-emacs-26.patch"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/renard/dired-toggle-sudo")
+    (synopsis "Browse directory with @code{sudo} privileges")
+    (description "This package allows for the use of @code{dired} with
+@code{sudo} privileges.")
+    (license license:wtfpl2)))
+
 (define-public emacs-memoize
   (package
     (name "emacs-memoize")
diff --git a/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch b/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch
new file mode 100644
index 0000000000..d979b113d0
--- /dev/null
+++ b/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch
@@ -0,0 +1,49 @@
+From 3c0f4b27a079b90dc632f5061a81ce28cef24801 Mon Sep 17 00:00:00 2001
+From: eryx67 <eryx67@gmail.com>
+Date: Thu, 29 Nov 2018 10:30:20 +0500
+Subject: [PATCH] fix for latest emacs
+
+---
+ dired-toggle-sudo.el | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/dired-toggle-sudo.el b/dired-toggle-sudo.el
+index 386921b..fe5898e 100644
+--- a/dired-toggle-sudo.el
++++ b/dired-toggle-sudo.el
+@@ -37,17 +37,20 @@
+ unless SUDO-USER is provided."
+   (let* (;; Handle the case of local files. `tramp-dissect-file-name' does
+ 	 ;; not raise an error anymore.
+-	 (path (if (tramp-tramp-file-p path) path (concat "/:" path)))
++	 ;;(path (if (tramp-tramp-file-p path) path (concat "/-::" path)))
+ 	 (file-vec (or (ignore-errors (tramp-dissect-file-name
+ 				       path))
+ 		       (tramp-dissect-file-name
+-			(concat "/:" path) 1)))
++			(concat "/-::" path) 1)))
+ 	 (method  (tramp-file-name-method file-vec))
+ 	 (user (tramp-file-name-user file-vec))
+ 	 (host  (tramp-file-name-host file-vec))
++         (domain  (tramp-file-name-domain file-vec))
++         (port  (tramp-file-name-port file-vec))
+ 	 (localname (expand-file-name
+ 		     (tramp-file-name-localname file-vec))))
+-    (when (string= system-name host)
++    (when (or (string= (system-name) host)
++              (string= "-" host))
+       (setq host nil))
+     (cond
+      ;; remote directory -> sudo
+@@ -67,7 +70,7 @@ unless SUDO-USER is provided."
+       (setq method "sudo" user sudo-user)))
+     (replace-regexp-in-string
+      "^/:/" "/"
+-     (tramp-make-tramp-file-name method user host localname))))
++     (tramp-make-tramp-file-name method domain user host port localname))))
+ 
+ (defun dired-toggle-sudo-find (fname)
+   "Create a new buffer for file name FNAME."
+-- 
+2.22.0
+
-- 
2.22.0


[-- Attachment #8: 0007-gnu-emacs-highlight-indentation-Update-to-0.7.0-1.d0.patch --]
[-- Type: text/x-patch, Size: 2863 bytes --]

From 7bf0691a2dc64ab27bbb841b1c5d20121b760252 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 01:49:54 +0200
Subject: [PATCH 07/10] gnu: emacs-highlight-indentation: Update to
 0.7.0-1.d03803f.

* gnu/packages/emacs-xyz.scm (emacs-highlight-indentation): Update to 0.7.0-1.d03803f.
---
 gnu/packages/emacs-xyz.scm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 73a7668b08..3eaebe49e2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5580,28 +5580,32 @@ environments (virtualenv) inside Emacs.")
     (license license:gpl3+)))
 
 (define-public emacs-highlight-indentation
-  (package
-    (name "emacs-highlight-indentation")
-    (version "0.7.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/antonj/Highlight-Indentation-for-Emacs/")
-    (synopsis "Highlighting indentation for Emacs")
-    (description "Provides two minor modes to highlight indentation guides in Emacs:
+  ;; Last release version is from 2015.
+  (let ((commit "d03803f2c06749c430443a3d24e039cbafc9c58f")
+        (version "0.7.0")
+        (revision "1"))
+    (package
+      (name "emacs-highlight-indentation")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1jq0gf4kcx9hvrw40rnw5c2qynjpjw1vsjbi2i4lqjbsnfnxn4wz"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/antonj/Highlight-Indentation-for-Emacs/")
+      (synopsis "Highlighting indentation for Emacs")
+      (description "Provides two minor modes to highlight indentation guides in Emacs:
 @enumerate
 @item @code{highlight-indentation-mode}, which displays guidelines
 indentation (space indentation only).
 @item @code{highlight-indentation-current-column-mode}, which displays guidelines for the current-point indentation (space indentation only).
 @end enumerate")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public emacs-elpy
   (package
-- 
2.22.0


[-- Attachment #9: 0008-gnu-emacs-so-long-Update-to-1.0-2.cfae473.patch --]
[-- Type: text/x-patch, Size: 1453 bytes --]

From 12dc56cf83e77632b6cdcd36ed7ab61612dd40e7 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 04:14:24 +0200
Subject: [PATCH 08/10] gnu: emacs-so-long: Update to 1.0-2.cfae473.

* gnu/packages/emacs-xyz.scm (emacs-so-long): Update to 1.0-2.cfae473.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3eaebe49e2..448e0ab4aa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13773,9 +13773,9 @@ server with @code{M-x pinentry-start}.")
       (license license:gpl3+))))
 
 (define-public emacs-so-long
-  (let ((commit "3ebe97decdb5cbbfba82ca686e0ad2c7d2722b4a")
+  (let ((commit "cfae473b1bf65f78ddb015159e667ec0103d881c")
         (version "1.0")
-        (revision "1"))
+        (revision "2"))
     (package
       (name "emacs-so-long")
       (version (git-version version revision commit))
@@ -13788,7 +13788,7 @@ server with @code{M-x pinentry-start}.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0fi71g5rsdsi978jz8406k8hvzgnssm9wxar8yqfhs97178r9s5m"))))
+           "0g943n5cl9lz5s7hszg6yvp10xd1xvd8mfgxyg0yckmp8fqkswin"))))
       (build-system emacs-build-system)
       (home-page "https://www.emacswiki.org/emacs/SoLong")
       (synopsis "Improve performance in files with long lines")
-- 
2.22.0


[-- Attachment #10: 0009-gnu-emacs-evil-expat-Update-to-0.0.1-1.f4fcd0a.patch --]
[-- Type: text/x-patch, Size: 1351 bytes --]

From 9ddf79585c315b16988d2078fc61edea27e6255d Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 05:00:46 +0200
Subject: [PATCH 09/10] gnu: emacs-evil-expat: Update to 0.0.1-1.f4fcd0a.

* gnu/packages/emacs-xyz.scm (emacs-evil-expat): Update to 0.0.1-1.f4fcd0a.
---
 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 448e0ab4aa..3fd5e67e2f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6403,7 +6403,7 @@ aligning text objects based on separators.")
       (license license:gpl3+))))
 
 (define-public emacs-evil-expat
-  (let ((commit "4c344ea19b789002d759a202ffbf594730d2c59a")
+  (let ((commit "f4fcd0aa3edc359adb5c986b5dd9188d220d84e2")
         (version "0.0.1")
         (revision "1"))
     (package
@@ -6418,7 +6418,7 @@ aligning text objects based on separators.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "16v7fnldxag6l1lsnrnhdjkga9qi78lbdfbb82k6pmv04991mbkr"))))
+           "0872ix682hkdz0k8pn6sb54rqkx00rz5fxpd5j2snx406yagpaxz"))))
       (build-system emacs-build-system)
       (propagated-inputs `(("emacs-evil" ,emacs-evil)))
       (home-page "https://github.com/edkolev/evil-expat")
-- 
2.22.0


[-- Attachment #11: 0010-gnu-emacs-lua-mode-Update-to-20151025-2.95c64bb.patch --]
[-- Type: text/x-patch, Size: 1796 bytes --]

From 50e1455b401a869d682e79cf065a3b44890b17a1 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 05:16:30 +0200
Subject: [PATCH 10/10] gnu: emacs-lua-mode: Update to 20151025-2.95c64bb.

* gnu/packages/emacs-xyz.scm (emacs-lua-mode): Update to 20151025-2.95c64bb.
---
 gnu/packages/emacs-xyz.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3fd5e67e2f..861c4099f3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6123,21 +6123,22 @@ xref, etc...) are still available, but with better integration.")
       (license license:gpl3+))))
 
 (define-public emacs-lua-mode
-  (let ((commit "652e299cb967fccca827dda381d61a9c144d97de")
-        (revision "1"))
+  (let ((commit "95c64bb5634035630e8c59d10d4a1d1003265743")
+        (version "20151025")
+        (revision "2"))
     (package
       (name "emacs-lua-mode")
-      (version (string-append "20151025." revision "-" (string-take commit 9)))
+      (version (git-version version revision commit))
       (home-page "https://github.com/immerrr/lua-mode/")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url home-page)
                       (commit commit)))
-                (file-name (string-append name "-" version ".checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "053025k930wh0lak6rc1973ynfrmm8zsyzfqhhd39x7abkl41hc9"))))
+                  "1mra4db25ds64526dsj8m5yv0kfq3lgggjh1x6xmqypdaryddbcp"))))
       (build-system emacs-build-system)
       (synopsis "Major mode for lua")
       (description
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#36778] [PATCH] Add and update Emacs packages.
  2019-07-27  3:23 ` Brian Leung
@ 2019-07-30  9:03   ` Brian Leung
  2019-08-01 16:02     ` Brian Leung
  0 siblings, 1 reply; 7+ messages in thread
From: Brian Leung @ 2019-07-30  9:03 UTC (permalink / raw)
  To: 36778


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

I've rebased and updated with several more patches.

On Sat, Jul 27, 2019 at 5:23 AM Brian Leung <bkleung89@gmail.com> wrote:

> I rebased and added a few additional patches.
>

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

[-- Attachment #2: 0002-gnu-Add-emacs-evil-traces.patch --]
[-- Type: text/x-patch, Size: 1831 bytes --]

From 6767b67578000c39ee22538c20c33333079e3193 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:05:29 +0200
Subject: [PATCH 02/16] gnu: Add emacs-evil-traces.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 33fcc9a108..14490833cb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16635,6 +16635,31 @@ provided.  Those alternative commands are and bound by default to their
 corresponding Evil keys.")
       (license license:expat))))
 
+(define-public emacs-evil-traces
+  (let ((commit "b41b7432b8110378c199a3d25af464083777f453")
+        (version "0.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-evil-traces")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/mamapanda/evil-traces.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0a15f2saynz9fws1h5s7py3cshsk4xs1kwgwj1m5rsin36g0j6hc"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/mamapanda/evil-traces")
+      (synopsis "Visual hints for @code{evil-ex}")
+      (description "This adds visual hints to certain @code{ex} commands in
+@code{evil-mode}.")
+      (license license:gpl3+))))
+
 (define-public emacs-xterm-color
   (let ((commit "a452ab38a7cfae97078062ff8885b5d74fd1e5a6")
         (version "1.8")
-- 
2.22.0


[-- Attachment #3: 0001-gnu-emacs-helm-Update-to-3.3.patch --]
[-- Type: text/x-patch, Size: 1159 bytes --]

From f9bbea73f58b895b2fb1806f67324e8c53cca535 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:05:18 +0200
Subject: [PATCH 01/16] gnu: emacs-helm: Update to 3.3.

* gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.3.
---
 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 314f4867b3..33fcc9a108 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5931,7 +5931,7 @@ ack, ag, helm and pt.")
 (define-public emacs-helm
   (package
     (name "emacs-helm")
-    (version "3.2")
+    (version "3.3")
     (source
      (origin
        (method git-fetch)
@@ -5940,7 +5940,7 @@ ack, ag, helm and pt.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12yyprpgh2by2pd41i4z9gz55fxg0f90x03bfrsf791xwbhf6931"))))
+        (base32 "0fqhw7r9fcsja5d3pgbipw7pkw9nj534faav6hi45413hc3gyv92"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
2.22.0


[-- Attachment #4: 0004-gnu-emacs-magit-todos-Update-to-1.3.patch --]
[-- Type: text/x-patch, Size: 1179 bytes --]

From 5ee6901cf1d479c95c2e83f044b1ec9374d29959 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 05:54:14 +0200
Subject: [PATCH 04/16] gnu: emacs-magit-todos: Update to 1.3.

* gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.3.
---
 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 a5215ef530..12ccb3f369 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14169,7 +14169,7 @@ buffers – other modes on the TODO list).
 (define-public emacs-magit-todos
   (package
     (name "emacs-magit-todos")
-    (version "1.2")
+    (version "1.3")
     (source
      (origin
        (method git-fetch)
@@ -14179,7 +14179,7 @@ buffers – other modes on the TODO list).
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "17a18gszbypz82bj36xbfyykc4s9rz83vwmpxvlf65svhd51c0nh"))))
+         "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
2.22.0


[-- Attachment #5: 0003-gnu-Add-emacs-scroll-on-drag.patch --]
[-- Type: text/x-patch, Size: 1707 bytes --]

From 7981c38baba65daf60154ca6c7523b6139a17d7f Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 24 Jul 2019 04:29:55 +0200
Subject: [PATCH 03/16] gnu: Add emacs-scroll-on-drag.

* gnu/packages/emacs-xyz.scm (emacs-scroll-on-drag): New variable.
---
 gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 14490833cb..a5215ef530 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12679,6 +12679,30 @@ When @code{gac-automatically-push-p} is non-nil, it also tries to push to
 the current upstream.")
     (license license:gpl3+)))
 
+(define-public emacs-scroll-on-drag
+  (let ((commit "e509c10ccdf6f4239d448da8aa6f8b9cc36bb340")
+        (version "0.1")
+        (revision "1"))
+    (package
+      (name "emacs-scroll-on-drag")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/ideasman42/emacs-scroll-on-drag.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00yy0bx874ijg8s16bp13n0w5q2fmjiklz0kgbwh4wpb7fawk8vv"))))
+      (build-system emacs-build-system)
+      (home-page "https://gitlab.com/ideasman42/emacs-scroll-on-drag")
+      (synopsis "Interactive scrolling")
+      (description "This package permits scrolling at increasing speeds based
+on drag distance.")
+      (license license:gpl3+))))
+
 (define-public emacs-company-restclient
   (package
     (name "emacs-company-restclient")
-- 
2.22.0


[-- Attachment #6: 0005-gnu-Add-emacs-helm-org-rifle.patch --]
[-- Type: text/x-patch, Size: 1684 bytes --]

From d808e2accceedc21af4c1b1c03e95d8ea1ebd4f8 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Thu, 25 Jul 2019 00:03:59 +0200
Subject: [PATCH 05/16] gnu: Add emacs-helm-org-rifle.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 12ccb3f369..18edb58d87 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7159,6 +7159,32 @@ find files owned by packages...  And much more, including performing all the
 above over the network.")
       (license license:gpl3+))))
 
+(define-public emacs-helm-org-rifle
+  (package
+    (name "emacs-helm-org-rifle")
+    (version "1.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/alphapapa/helm-org-rifle")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1r38xhwvgbv6kn5x159phz3xgss7f1rc7icq27rnr4d8aj91wm6k"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-f" ,emacs-f)
+       ("emacs-helm" ,emacs-helm)
+       ("emacs-s" ,emacs-s)))
+    (home-page "https://github.com/alphapapa/helm-org-rifle")
+    (synopsis "Rifle through Org files")
+    (description "This package searches both headings and contents of entries
+in Org buffers and displays matching entries.")
+    (license license:gpl3+)))
+
 (define-public emacs-memoize
   (package
     (name "emacs-memoize")
-- 
2.22.0


[-- Attachment #7: 0006-gnu-Add-emacs-dired-toggle-sudo.patch --]
[-- Type: text/x-patch, Size: 4596 bytes --]

From 87f9b1328a7245473ebe4b5ca7c7dc5be9a65777 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 01:00:50 +0200
Subject: [PATCH 06/16] gnu: Add emacs-dired-toggle-sudo.

* gnu/packages/emacs-xyz.scm (emacs-dired-toggle-sudo): New variable.
* gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/emacs-xyz.scm                    | 24 +++++++++
 .../emacs-dired-toggle-sudo-emacs-26.patch    | 49 +++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index bd509647dc..92fa4f37a9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -772,6 +772,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/elfutils-tests-ptrace.patch		\
   %D%/packages/patches/elixir-path-length.patch			\
   %D%/packages/patches/einstein-build.patch			\
+  %D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch   \
   %D%/packages/patches/emacs-exec-path.patch			\
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch	\
   %D%/packages/patches/emacs-json-reformat-fix-tests.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 18edb58d87..73a7668b08 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7185,6 +7185,30 @@ above over the network.")
 in Org buffers and displays matching entries.")
     (license license:gpl3+)))
 
+(define-public emacs-dired-toggle-sudo
+  (package
+    (name "emacs-dired-toggle-sudo")
+    (version "1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/renard/dired-toggle-sudo")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2"))
+       (patches
+        (search-patches
+         "emacs-dired-toggle-sudo-emacs-26.patch"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/renard/dired-toggle-sudo")
+    (synopsis "Browse directory with @code{sudo} privileges")
+    (description "This package allows for the use of @code{dired} with
+@code{sudo} privileges.")
+    (license license:wtfpl2)))
+
 (define-public emacs-memoize
   (package
     (name "emacs-memoize")
diff --git a/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch b/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch
new file mode 100644
index 0000000000..d979b113d0
--- /dev/null
+++ b/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch
@@ -0,0 +1,49 @@
+From 3c0f4b27a079b90dc632f5061a81ce28cef24801 Mon Sep 17 00:00:00 2001
+From: eryx67 <eryx67@gmail.com>
+Date: Thu, 29 Nov 2018 10:30:20 +0500
+Subject: [PATCH] fix for latest emacs
+
+---
+ dired-toggle-sudo.el | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/dired-toggle-sudo.el b/dired-toggle-sudo.el
+index 386921b..fe5898e 100644
+--- a/dired-toggle-sudo.el
++++ b/dired-toggle-sudo.el
+@@ -37,17 +37,20 @@
+ unless SUDO-USER is provided."
+   (let* (;; Handle the case of local files. `tramp-dissect-file-name' does
+ 	 ;; not raise an error anymore.
+-	 (path (if (tramp-tramp-file-p path) path (concat "/:" path)))
++	 ;;(path (if (tramp-tramp-file-p path) path (concat "/-::" path)))
+ 	 (file-vec (or (ignore-errors (tramp-dissect-file-name
+ 				       path))
+ 		       (tramp-dissect-file-name
+-			(concat "/:" path) 1)))
++			(concat "/-::" path) 1)))
+ 	 (method  (tramp-file-name-method file-vec))
+ 	 (user (tramp-file-name-user file-vec))
+ 	 (host  (tramp-file-name-host file-vec))
++         (domain  (tramp-file-name-domain file-vec))
++         (port  (tramp-file-name-port file-vec))
+ 	 (localname (expand-file-name
+ 		     (tramp-file-name-localname file-vec))))
+-    (when (string= system-name host)
++    (when (or (string= (system-name) host)
++              (string= "-" host))
+       (setq host nil))
+     (cond
+      ;; remote directory -> sudo
+@@ -67,7 +70,7 @@ unless SUDO-USER is provided."
+       (setq method "sudo" user sudo-user)))
+     (replace-regexp-in-string
+      "^/:/" "/"
+-     (tramp-make-tramp-file-name method user host localname))))
++     (tramp-make-tramp-file-name method domain user host port localname))))
+ 
+ (defun dired-toggle-sudo-find (fname)
+   "Create a new buffer for file name FNAME."
+-- 
+2.22.0
+
-- 
2.22.0


[-- Attachment #8: 0007-gnu-emacs-highlight-indentation-Update-to-0.7.0-1.d0.patch --]
[-- Type: text/x-patch, Size: 2863 bytes --]

From 0e24fa45f211a86d535d7308cce60bb0cf9a3615 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 01:49:54 +0200
Subject: [PATCH 07/16] gnu: emacs-highlight-indentation: Update to
 0.7.0-1.d03803f.

* gnu/packages/emacs-xyz.scm (emacs-highlight-indentation): Update to 0.7.0-1.d03803f.
---
 gnu/packages/emacs-xyz.scm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 73a7668b08..3eaebe49e2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5580,28 +5580,32 @@ environments (virtualenv) inside Emacs.")
     (license license:gpl3+)))
 
 (define-public emacs-highlight-indentation
-  (package
-    (name "emacs-highlight-indentation")
-    (version "0.7.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/antonj/Highlight-Indentation-for-Emacs/")
-    (synopsis "Highlighting indentation for Emacs")
-    (description "Provides two minor modes to highlight indentation guides in Emacs:
+  ;; Last release version is from 2015.
+  (let ((commit "d03803f2c06749c430443a3d24e039cbafc9c58f")
+        (version "0.7.0")
+        (revision "1"))
+    (package
+      (name "emacs-highlight-indentation")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1jq0gf4kcx9hvrw40rnw5c2qynjpjw1vsjbi2i4lqjbsnfnxn4wz"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/antonj/Highlight-Indentation-for-Emacs/")
+      (synopsis "Highlighting indentation for Emacs")
+      (description "Provides two minor modes to highlight indentation guides in Emacs:
 @enumerate
 @item @code{highlight-indentation-mode}, which displays guidelines
 indentation (space indentation only).
 @item @code{highlight-indentation-current-column-mode}, which displays guidelines for the current-point indentation (space indentation only).
 @end enumerate")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public emacs-elpy
   (package
-- 
2.22.0


[-- Attachment #9: 0009-gnu-emacs-evil-expat-Update-to-0.0.1-1.f4fcd0a.patch --]
[-- Type: text/x-patch, Size: 1351 bytes --]

From 6c65ab59d23e706b08f7f0468befc5ec91d42264 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 05:00:46 +0200
Subject: [PATCH 09/16] gnu: emacs-evil-expat: Update to 0.0.1-1.f4fcd0a.

* gnu/packages/emacs-xyz.scm (emacs-evil-expat): Update to 0.0.1-1.f4fcd0a.
---
 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 448e0ab4aa..3fd5e67e2f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6403,7 +6403,7 @@ aligning text objects based on separators.")
       (license license:gpl3+))))
 
 (define-public emacs-evil-expat
-  (let ((commit "4c344ea19b789002d759a202ffbf594730d2c59a")
+  (let ((commit "f4fcd0aa3edc359adb5c986b5dd9188d220d84e2")
         (version "0.0.1")
         (revision "1"))
     (package
@@ -6418,7 +6418,7 @@ aligning text objects based on separators.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "16v7fnldxag6l1lsnrnhdjkga9qi78lbdfbb82k6pmv04991mbkr"))))
+           "0872ix682hkdz0k8pn6sb54rqkx00rz5fxpd5j2snx406yagpaxz"))))
       (build-system emacs-build-system)
       (propagated-inputs `(("emacs-evil" ,emacs-evil)))
       (home-page "https://github.com/edkolev/evil-expat")
-- 
2.22.0


[-- Attachment #10: 0008-gnu-emacs-so-long-Update-to-1.0-2.cfae473.patch --]
[-- Type: text/x-patch, Size: 1453 bytes --]

From 2b9040cfbe345df3fb0db4ae1417775d2b113b48 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 04:14:24 +0200
Subject: [PATCH 08/16] gnu: emacs-so-long: Update to 1.0-2.cfae473.

* gnu/packages/emacs-xyz.scm (emacs-so-long): Update to 1.0-2.cfae473.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3eaebe49e2..448e0ab4aa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13773,9 +13773,9 @@ server with @code{M-x pinentry-start}.")
       (license license:gpl3+))))
 
 (define-public emacs-so-long
-  (let ((commit "3ebe97decdb5cbbfba82ca686e0ad2c7d2722b4a")
+  (let ((commit "cfae473b1bf65f78ddb015159e667ec0103d881c")
         (version "1.0")
-        (revision "1"))
+        (revision "2"))
     (package
       (name "emacs-so-long")
       (version (git-version version revision commit))
@@ -13788,7 +13788,7 @@ server with @code{M-x pinentry-start}.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0fi71g5rsdsi978jz8406k8hvzgnssm9wxar8yqfhs97178r9s5m"))))
+           "0g943n5cl9lz5s7hszg6yvp10xd1xvd8mfgxyg0yckmp8fqkswin"))))
       (build-system emacs-build-system)
       (home-page "https://www.emacswiki.org/emacs/SoLong")
       (synopsis "Improve performance in files with long lines")
-- 
2.22.0


[-- Attachment #11: 0010-gnu-emacs-lua-mode-Update-to-20151025-2.95c64bb.patch --]
[-- Type: text/x-patch, Size: 1796 bytes --]

From a07ccd5f3d433eb33cf58460a55a447b95cb1207 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 27 Jul 2019 05:16:30 +0200
Subject: [PATCH 10/16] gnu: emacs-lua-mode: Update to 20151025-2.95c64bb.

* gnu/packages/emacs-xyz.scm (emacs-lua-mode): Update to 20151025-2.95c64bb.
---
 gnu/packages/emacs-xyz.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3fd5e67e2f..861c4099f3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6123,21 +6123,22 @@ xref, etc...) are still available, but with better integration.")
       (license license:gpl3+))))
 
 (define-public emacs-lua-mode
-  (let ((commit "652e299cb967fccca827dda381d61a9c144d97de")
-        (revision "1"))
+  (let ((commit "95c64bb5634035630e8c59d10d4a1d1003265743")
+        (version "20151025")
+        (revision "2"))
     (package
       (name "emacs-lua-mode")
-      (version (string-append "20151025." revision "-" (string-take commit 9)))
+      (version (git-version version revision commit))
       (home-page "https://github.com/immerrr/lua-mode/")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url home-page)
                       (commit commit)))
-                (file-name (string-append name "-" version ".checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "053025k930wh0lak6rc1973ynfrmm8zsyzfqhhd39x7abkl41hc9"))))
+                  "1mra4db25ds64526dsj8m5yv0kfq3lgggjh1x6xmqypdaryddbcp"))))
       (build-system emacs-build-system)
       (synopsis "Major mode for lua")
       (description
-- 
2.22.0


[-- Attachment #12: 0011-gnu-emacs-counsel-etags-Update-to-1.8.7.patch --]
[-- Type: text/x-patch, Size: 1241 bytes --]

From ecf4284547ce08fe2d552c28437958bcb91aa0f8 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 30 Jul 2019 05:08:16 +0200
Subject: [PATCH 11/16] gnu: emacs-counsel-etags: Update to 1.8.7.

* gnu/packages/emacs-xyz.scm (emacs-counsel-etags): Update to 1.8.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 861c4099f3..bf81cef099 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16271,7 +16271,7 @@ previewed by scrolling up and down within a @code{dired} buffer.")
 (define-public emacs-counsel-etags
   (package
     (name "emacs-counsel-etags")
-    (version "1.8.4")
+    (version "1.8.7")
     (source
      (origin
        (method git-fetch)
@@ -16281,7 +16281,7 @@ previewed by scrolling up and down within a @code{dired} buffer.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "14my9jvxl26a5yn381h5pi5481y9d9gyk7wnxxd0s4sjc964c5h5"))))
+         "0vjcjspfrz1csnmfi6r7p7f070a496adxkqnsxwx1gx8cpylwp1g"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-ivy" ,emacs-ivy)))
-- 
2.22.0


[-- Attachment #13: 0013-gnu-Add-emacs-mc-extras.patch --]
[-- Type: text/x-patch, Size: 1838 bytes --]

From b01a8e1c3544bfa6d40d578f0c6e8f4e53422af8 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 30 Jul 2019 10:49:20 +0200
Subject: [PATCH 13/16] gnu: Add emacs-mc-extras.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7b220fc431..7a94cbfb6b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3410,6 +3410,33 @@ completion candidate when using the Company text completion framework.")
 simultaneous cursors.")
     (license license:gpl3+)))
 
+(define-public emacs-mc-extras
+  (let ((commit "053abc52181b8718559d7361a587bbb795faf164")
+        (version "1.2.4")
+        (revision "1"))
+    (package
+      (name "emacs-mc-extras")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/knu/mc-extras.el.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "16y48qrd20m20vypvys5jp4v4gc1qrqlkm75s1pk1r68i9zrw481"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-multiple-cursors" ,emacs-multiple-cursors)))
+      (home-page "https://github.com/knu/mc-extras.el")
+      (synopsis "Extra functions for manipulating multiple cursors")
+      (description
+       "This package provides additional functions for
+@code{multiple-cursors}, including functions for marking s-expressions,
+comparing characters, removing cursors, and more.")
+      (license license:bsd-2))))
+
 (define-public emacs-typo
   (package
     (name "emacs-typo")
-- 
2.22.0


[-- Attachment #14: 0012-gnu-emacs-nodejs-repl-Update-to-0.2.2.patch --]
[-- Type: text/x-patch, Size: 1269 bytes --]

From 882e121e96b863e3b1e2950177eb605b5ef94232 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 30 Jul 2019 05:10:02 +0200
Subject: [PATCH 12/16] gnu: emacs-nodejs-repl: Update to 0.2.2.

* gnu/packages/emacs-xyz.scm (emacs-nodejs-repl): Update to 0.2.2.
---
 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 bf81cef099..7b220fc431 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5228,7 +5228,7 @@ strings, and code folding.")
 (define-public emacs-nodejs-repl
   (package
     (name "emacs-nodejs-repl")
-    (version "0.2.1")
+    (version "0.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5237,7 +5237,7 @@ strings, and code folding.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "05ccv87rnw7fss3lib8m9sywjrj6n92fnd7mmhmjh27g2klqc83z"))))
+                "1kkj888k9x5n0i7xkia177gzsa84my3g8n0n7v65281cc4f1yhk5"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/abicky/nodejs-repl.el")
     (synopsis "Node.js REPL inside Emacs")
-- 
2.22.0


[-- Attachment #15: 0014-gnu-Add-emacs-hercules.patch --]
[-- Type: text/x-patch, Size: 1864 bytes --]

From cd7a63ddd5e11172d70f8af63ddd8f21a5d3207d Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 30 Jul 2019 10:50:36 +0200
Subject: [PATCH 14/16] gnu: Add emacs-hercules.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7a94cbfb6b..39cdaadbc1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8705,6 +8705,33 @@ available key bindings that follow C-x (or as many as space allows given your
 settings).")
     (license license:gpl3+)))
 
+(define-public emacs-hercules
+  (let ((commit "3345904a0dab4c7a4d4478f0766f1d9f5d1bb501")
+        (version "0.2")
+        (revision "1"))
+    (package
+      (name "emacs-hercules")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/jjzmajic/hercules.el.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0cpq8h6l47nqhzch6snax5yrhxl8p4wn35q13ci35lj3iq8kmlk8"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-which-key" ,emacs-which-key)))
+      (home-page "https://gitlab.com/jjzmajic/hercules.el")
+      (synopsis "Call a chain of related commands without repeated prefix keys")
+      (description
+       "This package provides sticky-key-like functionality to obviate the
+need for repeated prefix-key sequences, and can reuse existing keymaps. The
+list of commands is displayed in a handy popup.")
+      (license license:gpl3+))))
+
 (define-public emacs-ws-butler
   (package
     (name "emacs-ws-butler")
-- 
2.22.0


[-- Attachment #16: 0015-gnu-Add-emacs-math-symbol-lists.patch --]
[-- Type: text/x-patch, Size: 1758 bytes --]

From 74ead8df1fb3c659377f711891395b29d5f39644 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 30 Jul 2019 10:58:59 +0200
Subject: [PATCH 15/16] gnu: Add emacs-math-symbol-lists.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 39cdaadbc1..e7ab2cc21c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3389,6 +3389,29 @@ for the current function or variable in the minibuffer.")
 completion candidate when using the Company text completion framework.")
     (license license:gpl3+)))
 
+(define-public emacs-math-symbol-lists
+  (let ((commit "dc7531cff0c845d5470a50c24d5d7309b2ced7eb")
+        (version "1.2.1")
+        (revision "1"))
+    (package
+      (name "emacs-math-symbol-lists")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/vspinu/math-symbol-lists.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "094m21i9rns6m59cmhxcivxxafbg52w8f8na4y3v47aq67zmhhqm"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/vspinu/math-symbol-lists")
+      (synopsis "Lists of Unicode math symbols and @code{LaTeX} commands")
+      (description "This is a storage package used by completion engines like
+@code{company-math}.")
+      (license license:gpl3+))))
+
 (define-public emacs-multiple-cursors
   (package
     (name "emacs-multiple-cursors")
-- 
2.22.0


[-- Attachment #17: 0016-gnu-Add-emacs-company-math.patch --]
[-- Type: text/x-patch, Size: 1876 bytes --]

From a6832ea59a06235b8814a94d915e955acda45f6a Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 30 Jul 2019 10:59:10 +0200
Subject: [PATCH 16/16] gnu: Add emacs-company-math.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e7ab2cc21c..178fd6e403 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3412,6 +3412,32 @@ completion candidate when using the Company text completion framework.")
 @code{company-math}.")
       (license license:gpl3+))))
 
+(define-public emacs-company-math
+  (let ((commit "600e49449644f6835f9dc3501bc58461999e8ab9")
+        (version "1.3")
+        (revision "1"))
+    (package
+      (name "emacs-company-math")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/vspinu/company-math.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1ps2lpkzn8mjbpcbvvy1qz3xbgrh6951x8y9bsd1fm32drdph9lh"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-math-symbol-lists" ,emacs-math-symbol-lists)
+         ("emacs-company" ,emacs-company)))
+      (home-page "https://github.com/vspinu/company-math")
+      (synopsis "Completion backends for Unicode math symbols and @code{LaTeX} tags")
+      (description "This package provides a backend for use with
+@code{company-mode} allowing for completion of common math symbols.")
+      (license license:gpl3+))))
+
 (define-public emacs-multiple-cursors
   (package
     (name "emacs-multiple-cursors")
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#36778] [PATCH] Add and update Emacs packages.
  2019-07-30  9:03   ` Brian Leung
@ 2019-08-01 16:02     ` Brian Leung
  2019-08-02  4:45       ` Brian Leung
  0 siblings, 1 reply; 7+ messages in thread
From: Brian Leung @ 2019-08-01 16:02 UTC (permalink / raw)
  To: 36778


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

I've added another patch.

On Tue, Jul 30, 2019 at 11:03 AM Brian Leung <bkleung89@gmail.com> wrote:

> I've rebased and updated with several more patches.
>
> On Sat, Jul 27, 2019 at 5:23 AM Brian Leung <bkleung89@gmail.com> wrote:
>
>> I rebased and added a few additional patches.
>>
>

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

[-- Attachment #2: 0017-gnu-Add-emacs-nswbuff.patch --]
[-- Type: text/x-patch, Size: 1691 bytes --]

From 67beb2ce3f2ad52ce1cb832a6bd6594de1c07cb0 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Thu, 1 Aug 2019 17:59:38 +0200
Subject: [PATCH] gnu: Add emacs-nswbuff.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 178fd6e403..a199791f32 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3438,6 +3438,29 @@ completion candidate when using the Company text completion framework.")
 @code{company-mode} allowing for completion of common math symbols.")
       (license license:gpl3+))))
 
+(define-public emacs-nswbuff
+  (let ((commit "362da7f3687e2eb5bb11667347de85f4a9d002bc")
+        (version "1.0")
+        (revision "1"))
+    (package
+      (name "emacs-nswbuff")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/joostkremers/nswbuff.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0l2xfz8z5qd4hz3kv6zn7h6qq3narkilri8a071y1n8j31jps4ma"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/joostkremers/nswbuff")
+      (synopsis "Quickly switch between buffers")
+      (description "This package allows for navigating between buffers within
+a customizable list.")
+      (license license:gpl3+))))
+
 (define-public emacs-multiple-cursors
   (package
     (name "emacs-multiple-cursors")
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#36778] [PATCH] Add and update Emacs packages.
  2019-08-01 16:02     ` Brian Leung
@ 2019-08-02  4:45       ` Brian Leung
  2019-08-03 18:32         ` Brian Leung
  0 siblings, 1 reply; 7+ messages in thread
From: Brian Leung @ 2019-08-02  4:45 UTC (permalink / raw)
  To: 36778


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

OK, I've added two more patches.

On Thu, Aug 1, 2019 at 6:02 PM Brian Leung <bkleung89@gmail.com> wrote:

> I've added another patch.
>
> On Tue, Jul 30, 2019 at 11:03 AM Brian Leung <bkleung89@gmail.com> wrote:
>
>> I've rebased and updated with several more patches.
>>
>> On Sat, Jul 27, 2019 at 5:23 AM Brian Leung <bkleung89@gmail.com> wrote:
>>
>>> I rebased and added a few additional patches.
>>>
>>

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

[-- Attachment #2: 0018-gnu-emacs-dired-hacks-Update-to-0.0.1-2.886befe.patch --]
[-- Type: text/x-patch, Size: 1390 bytes --]

From 85b4ac576a9939f6e5ea8c8eb612b5430716b255 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Fri, 2 Aug 2019 06:30:30 +0200
Subject: [PATCH 1/2] gnu: emacs-dired-hacks: Update to 0.0.1-2.886befe.

* gnu/packages/emacs-xyz.scm (emacs-dired-hacks): Update to 0.0.1-2.886befe.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a199791f32..254b387797 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8682,8 +8682,8 @@ the actual transformations.")
       (license license:gpl2+))))
 
 (define-public emacs-dired-hacks
-  (let ((commit "2c1234592aee91dcd9401bcd67213e6a4a464fd9")
-        (revision "1"))
+  (let ((commit "886befe113fae397407c804f72c45613d1d43535")
+        (revision "2"))
     (package
       (name "emacs-dired-hacks")
       (version (string-append "0.0.1-" revision "."
@@ -8696,7 +8696,7 @@ the actual transformations.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1g7mky41cahpryzj6frdgzdymknpqq7pidzfjj9304887kijmhj3"))))
+                  "1cvibg90ggyrivpjmcfprpi2fx7dpa68f8kzg08s88gw5ib75djl"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
2.22.0


[-- Attachment #3: 0019-gnu-Add-emacs-org-sidebar.patch --]
[-- Type: text/x-patch, Size: 2242 bytes --]

From d44629e12e479aa7777ca24ef63fe416f17f9a06 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Fri, 2 Aug 2019 06:43:00 +0200
Subject: [PATCH 2/2] gnu: Add emacs-org-sidebar.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 254b387797..60308fd1a6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4110,6 +4110,39 @@ minutes is started automatically.  Every 4 breaks a long break is
 started with 20 minutes.  All values are customizable.")
     (license license:gpl3+)))
 
+(define-public emacs-org-sidebar
+  (let ((commit "74ca98b9920f3de3f13d49866581435e1ec63ec5")
+        (version "0.1")
+        (revision "1"))
+    (package
+      (name "emacs-org-sidebar")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/alphapapa/org-sidebar.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "03p1ndyw2qp2skib5hszc4xyh84w7p2mhkd4a9dy6qv8q47xpsqn"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-org-super-agenda" ,emacs-org-super-agenda)
+         ("emacs-org" ,emacs-org)
+         ("emacs-org-ql" ,emacs-org-ql)
+         ("emacs-s" ,emacs-s)))
+      (home-page "https://github.com/alphapapa/org-sidebar")
+      (synopsis "Helpful sidebar for Org buffers")
+      (description "This package provides a sidebar for Org buffers.  At the
+top is a chronological list of scheduled and deadlined tasks in the current
+buffer (similar to the Org agenda ,but without all its features), and below
+that is a list of all other non-done to-do items.  If the buffer is narrowed,
+the sidebar only shows items in the narrowed portion; this allows seeing an
+overview of tasks in a subtree.")
+      (license license:gpl3+))))
+
 (define-public emacs-org-trello
   (package
     (name "emacs-org-trello")
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#36778] [PATCH] Add and update Emacs packages.
  2019-08-02  4:45       ` Brian Leung
@ 2019-08-03 18:32         ` Brian Leung
  2019-08-05 14:23           ` bug#36778: " Ricardo Wurmus
  0 siblings, 1 reply; 7+ messages in thread
From: Brian Leung @ 2019-08-03 18:32 UTC (permalink / raw)
  To: 36778


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

Two more patches are attached.

On Fri, Aug 2, 2019 at 6:45 AM Brian Leung <bkleung89@gmail.com> wrote:

> OK, I've added two more patches.
>
> On Thu, Aug 1, 2019 at 6:02 PM Brian Leung <bkleung89@gmail.com> wrote:
>
>> I've added another patch.
>>
>> On Tue, Jul 30, 2019 at 11:03 AM Brian Leung <bkleung89@gmail.com> wrote:
>>
>>> I've rebased and updated with several more patches.
>>>
>>> On Sat, Jul 27, 2019 at 5:23 AM Brian Leung <bkleung89@gmail.com> wrote:
>>>
>>>> I rebased and added a few additional patches.
>>>>
>>>

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

[-- Attachment #2: 0021-gnu-emacs-ivy-Update-to-0.12.0-1.d3e4514.patch --]
[-- Type: text/x-patch, Size: 3923 bytes --]

From 547d414600c79520ea0a6b279e3ba576118ca195 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 3 Aug 2019 20:29:37 +0200
Subject: [PATCH 2/2] gnu: emacs-ivy: Update to 0.12.0-1.d3e4514.

* gnu/packages/emacs-xyz.scm (emacs-ivy): Update to 0.12.0-1.d3e4514.
---
 gnu/packages/emacs-xyz.scm | 74 ++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a69e56d36a..d63ec244c2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4736,45 +4736,51 @@ automatically.")
     (license license:gpl3+)))
 
 (define-public emacs-ivy
-  (package
-    (name "emacs-ivy")
-    (version "0.12.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/abo-abo/swiper.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0xgngn3jhmyn6mlkk9kmgfgh0w5i50b27syr4cgfgarg6p77j05w"))))
-    (build-system emacs-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (info (string-append out "/share/info")))
-               (with-directory-excursion "doc"
-                 (invoke "makeinfo" "ivy.texi")
-                 (install-file "ivy.info" info)
-                 #t)))))))
-    (propagated-inputs
-     `(("emacs-hydra" ,emacs-hydra)))
-    (native-inputs
-     `(("texinfo" ,texinfo)))
-    (home-page "http://oremacs.com/swiper/")
-    (synopsis "Incremental vertical completion for Emacs")
-    (description
-     "This package provides @code{ivy-read} as an alternative to
+  ;; The latest release version introduced a new feature, swiper-isearch, that
+  ;; generally works well but had some noticeable bugs; this later commit
+  ;; includes fixes for several of them.
+  (let ((commit "d3e4514fd72f217c704ae18afdf711bb9036a04d")
+        (version "0.12.0")
+        (revision "1"))
+    (package
+      (name "emacs-ivy")
+      (version "0.12.0")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/abo-abo/swiper.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "142axxc6vsl14cfyvzj9csiykxdn7vhw88fy955hzx7av4qfqg4x"))))
+      (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'install 'install-doc
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (info (string-append out "/share/info")))
+                 (with-directory-excursion "doc"
+                   (invoke "makeinfo" "ivy.texi")
+                   (install-file "ivy.info" info)
+                   #t)))))))
+      (propagated-inputs
+       `(("emacs-hydra" ,emacs-hydra)))
+      (native-inputs
+       `(("texinfo" ,texinfo)))
+      (home-page "http://oremacs.com/swiper/")
+      (synopsis "Incremental vertical completion for Emacs")
+      (description
+       "This package provides @code{ivy-read} as an alternative to
 @code{completing-read} and similar functions.  No attempt is made to determine
 the best candidate.  Instead, the user can navigate candidates with
 @code{ivy-next-line} and @code{ivy-previous-line}.  The matching is done by
 splitting the input text by spaces and re-building it into a regular
 expression.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-ivy-pass
   (let ((commit "5b523de1151f2109fdd6a8114d0af12eef83d3c5")
-- 
2.22.0


[-- Attachment #3: 0020-gnu-emacs-org-super-agenda-Update-to-1.1.1-1.375bde4.patch --]
[-- Type: text/x-patch, Size: 2870 bytes --]

From 42a5290f98bab67f12e4ec29ed033f8eed89b3b1 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 3 Aug 2019 20:15:22 +0200
Subject: [PATCH 1/2] gnu: emacs-org-super-agenda: Update to 1.1.1-1.375bde4.

* gnu/packages/emacs-xyz.scm (emacs-org-super-agenda): Update to 1.1.1-1.375bde4.
---
 gnu/packages/emacs-xyz.scm | 48 +++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 60308fd1a6..a69e56d36a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10647,29 +10647,33 @@ as well as functions for navigating between these headings.")
     (license license:gpl3+)))
 
 (define-public emacs-org-super-agenda
-  (package
-   (name "emacs-org-super-agenda")
-   (version "1.1")
-   (source (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "https://github.com/alphapapa/org-super-agenda")
-                  (commit version)))
-            (file-name (git-file-name name version))
-            (sha256
-             (base32
-              "0vzf91lsxnhwf52kvm8ycpf0wb9c8l91689vyhwgv4wz8q6cvjwp"))))
-   (build-system emacs-build-system)
-   (propagated-inputs
-    `(("emacs-org" ,emacs-org)
-      ("emacs-dash" ,emacs-dash)
-      ("emacs-ht" ,emacs-ht)
-      ("emacs-s" ,emacs-s)))
-   (home-page "https://github.com/alphapapa/org-super-agenda")
-   (synopsis "Supercharged Org agenda")
-   (description "This package allows items in the Org agenda to be grouped
+  ;; emacs-org-sidebar depends on a newer commit than the latest release version.
+  (let ((commit "375bde4ca72494ac88a2a9738754f047fe45cc4e")
+        (version "1.1.1")
+        (revision "1"))
+    (package
+      (name "emacs-org-super-agenda")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/alphapapa/org-super-agenda")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0hrwf02fqjm0d9gj146ax67ib76093qpqh7066dcxj2gy20625yj"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-org" ,emacs-org)
+         ("emacs-dash" ,emacs-dash)
+         ("emacs-ht" ,emacs-ht)
+         ("emacs-s" ,emacs-s)))
+      (home-page "https://github.com/alphapapa/org-super-agenda")
+      (synopsis "Supercharged Org agenda")
+      (description "This package allows items in the Org agenda to be grouped
 into sections while preserving the structure imposed by any timestamps.")
-   (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-org-make-toc
   (package
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* bug#36778: [PATCH] Add and update Emacs packages.
  2019-08-03 18:32         ` Brian Leung
@ 2019-08-05 14:23           ` Ricardo Wurmus
  0 siblings, 0 replies; 7+ messages in thread
From: Ricardo Wurmus @ 2019-08-05 14:23 UTC (permalink / raw)
  To: Brian Leung; +Cc: 36778-done


Hi Brian,

Thanks.  I applied all patches with minor changes in commit e15ec8bcec.
I moved “version” out of the let, because we want to use the value
that’s in the “version” field (the one with revision and commit)
throughout.

(I don’t know if that’s a problem with my mail client or if this was the
result of you attaching the patches, but they were not in the expected
order.  Perhaps you could use “git send-email” in the future?)

--
Ricardo

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-08-05 14:24 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-24  3:55 [bug#36778] [PATCH] Add and update Emacs packages Brian Leung
2019-07-27  3:23 ` Brian Leung
2019-07-30  9:03   ` Brian Leung
2019-08-01 16:02     ` Brian Leung
2019-08-02  4:45       ` Brian Leung
2019-08-03 18:32         ` Brian Leung
2019-08-05 14:23           ` bug#36778: " Ricardo Wurmus

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).