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

><span title='2024-06-03 00:27:11 +0200'>2024-06-03</span></td><td><a href='/guix/commit/configure.ac?id=f65bd477b0c7f58004a810cc9ba5f29bc231ee35'>build: Use the po4a command for the translation generation.</a><span class='msg-avail'>...</span></td><td>gemmaro</td></tr>
<tr><td><span title='2024-06-03 00:27:11 +0200'>2024-06-03</span></td><td><a href='/guix/commit/configure.ac?id=2d4af5247057505956e841d396ec78af9f769837'>build: Update the POT creation task with the po4a command.</a><span class='msg-avail'>...</span></td><td>gemmaro</td></tr>
<tr><td><span title='2024-05-25 23:28:30 -0400'>2024-05-25</span></td><td><a href='/guix/commit/configure.ac?id=77771036f0970083c146b709d792d128f4235125'>configure.ac: Set default value for the 'prefix' variable.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2024-04-19 16:45:38 +0200'>2024-04-19</span></td><td><a href='/guix/commit/configure.ac?id=bb089f76227666e11e6949038c4fd9e130e047a3'>maint: Resurrect running `make' from a tarball.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-10-22 20:35:15 -0400'>2023-10-22</span></td><td><a href='/guix/commit/configure.ac?id=4cf4dcb8b31274a8dfba6bae3a6826a1b521da3f'>teams: Adjust shebang to use 'guix repl'.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-09-26 17:36:58 +0200'>2023-09-26</span></td><td><a href='/guix/commit/configure.ac?id=f651a359691cbe4750f1fe8d14dd964f7971f916'>build: Add dependency on Git.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>