diff options
| author | Zhu Zihao <all_but_last@163.com> | 2025-07-18 22:12:26 +0800 | 
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2025-07-24 15:43:36 +0800 | 
| commit | 48bc3329c64c85a6a70759c2c7ca617fdd4dd1f3 (patch) | |
| tree | 61f53a748640cbd7be3ddefe3397b90ea5238c00 | |
| parent | 0e5a34097fb845397ba6d8655fca18d5aca6cad6 (diff) | |
gnu: emacs-yasnippet: Update to 0.14.3.
* gnu/packages/emacs-xyz.scm (emacs-yasnippet): Update to 0.14.3.
[source]{version}: Package comments revised.
{patches}: Drop stale patch introduced in https://issues.guix.gnu.org/65376
YASnippet can build without it now.
* gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch: Deleted.
* gnu/local.mk (dist_patch_DATA): Remove entry for 'emacs-yasnippet-fix-empty-snippet-next.patch'.
Change-Id: I209a0258801cb96cf34d83afd40534c76f3219be
Signed-off-by: Hilton Chain <hako@ultrarare.space>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 13 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch | 59 | 
3 files changed, 6 insertions, 67 deletions
| diff --git a/gnu/local.mk b/gnu/local.mk index 6e4664ac35..8c859de0e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1260,7 +1260,6 @@ dist_patch_DATA =						\    %D%/packages/patches/emacs-telega-path-placeholder.patch	\    %D%/packages/patches/emacs-telega-test-env.patch		\    %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\ -  %D%/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch	\    %D%/packages/patches/enblend-enfuse-reproducible.patch	\    %D%/packages/patches/enjarify-setup-py.patch			\    %D%/packages/patches/enlightenment-fix-setuid-path.patch	\ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63ca0a73a7..19c0149f88 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21087,21 +21087,20 @@ the Emacs TempEl package.")        (license license:gpl3+))))  (define-public emacs-yasnippet -  (let ((commit "297546f0853a6a51f5b05e954d0c6aea8caa5ec2")) ;version bump +  (let ((commit "dd570a6b22364212fff9769cbf4376bdbd7a63c5"))      (package        (name "emacs-yasnippet") -      (version "0.14.1") +      ;; Missing Git tags, version bumped in package file. +      (version "0.14.3")        (source         (origin           (method git-fetch)           (uri (git-reference -               (url "https://github.com/joaotavora/yasnippet") -               (commit commit))) +                (url "https://github.com/joaotavora/yasnippet") +                (commit commit)))           (file-name (git-file-name name version))           (sha256 -          (base32 "0b1fdigwjshfim6zyzkn2wa6k8xd4qlafrf7zgj5bsx6alrzac8v")) -         (patches -          (search-patches "emacs-yasnippet-fix-empty-snippet-next.patch")))) +          (base32 "1s7zsdw83v5v7alsnzzrrr3m177qnm7x4hr8w7f84a4lamd0h6s3"))))        (build-system emacs-build-system)        (arguments         (list diff --git a/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch b/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch deleted file mode 100644 index 1faea2b456..0000000000 --- a/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 925292484162bc35c4258e72c36462bb13a5c69a Mon Sep 17 00:00:00 2001 -From: Liliana Marie Prikler <liliana.prikler@gmail.com> -Date: Sat, 19 Aug 2023 08:38:17 +0200 -Subject: [PATCH] Guard against empty snippet in yas-next-field. - ---- - yasnippet.el | 29 +++++++++++++++-------------- - 1 file changed, 15 insertions(+), 14 deletions(-) - -diff --git a/yasnippet.el b/yasnippet.el -index e0b5537..41d86dd 100644 ---- a/yasnippet.el -+++ b/yasnippet.el -@@ -136,6 +136,7 @@ - (declare-function cl-progv-after "cl-extra") ; Needed for 23.4. - (require 'easymenu) - (require 'help-mode) -+(require 'subr-x) -  - (defvar yas--editing-template) - (defvar yas--guessed-modes) -@@ -3386,20 +3387,20 @@ Otherwise delegate to `yas-next-field'." - If there's none, exit the snippet." -   (interactive) -   (unless arg (setq arg 1)) --  (let* ((active-field (overlay-get yas--active-field-overlay 'yas--field)) --         (snippet (car (yas-active-snippets (yas--field-start active-field) --                                            (yas--field-end active-field)))) --         (target-field (yas--find-next-field arg snippet active-field))) --    (yas--letenv (yas--snippet-expand-env snippet) --      ;; Apply transform to active field. --      (when active-field --        (let ((yas-moving-away-p t)) --          (when (yas--field-update-display active-field) --            (yas--update-mirrors snippet)))) --      ;; Now actually move... --      (if target-field --          (yas--move-to-field snippet target-field) --        (yas-exit-snippet snippet))))) -+  (and-let* ((active-field (overlay-get yas--active-field-overlay 'yas--field)) -+             (snippet (car (yas-active-snippets (yas--field-start active-field) -+                                                (yas--field-end active-field))))) -+    (let ((target-field (yas--find-next-field arg snippet active-field))) -+      (yas--letenv (yas--snippet-expand-env snippet) -+        ;; Apply transform to active field. -+        (when active-field -+          (let ((yas-moving-away-p t)) -+            (when (yas--field-update-display active-field) -+              (yas--update-mirrors snippet)))) -+        ;; Now actually move... -+        (if target-field -+            (yas--move-to-field snippet target-field) -+          (yas-exit-snippet snippet)))))) -  - (defun yas--place-overlays (snippet field) -   "Correctly place overlays for SNIPPET's FIELD." ---  -2.41.0 - | 
