From patchwork Sat Aug 19 06:40:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53007 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A02727BBE9; Sat, 19 Aug 2023 09:44:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1DFF627BBE2 for ; Sat, 19 Aug 2023 09:44:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXHYy-0000dJ-RY; Sat, 19 Aug 2023 04:44:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXHYy-0000ct-CI for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXHYy-0000fE-4c for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXHYy-0005BG-Go; Sat, 19 Aug 2023 04:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65376] [PATCH emacs-team 7/7] gnu: emacs-yasnippet: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 19 Aug 2023 08:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65376@debbugs.gnu.org Cc: andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by 65376-submit@debbugs.gnu.org id=B65376.169243460719791 (code B ref 65376); Sat, 19 Aug 2023 08:44:04 +0000 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:27 +0000 Received: from localhost ([127.0.0.1]:49408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYN-000592-5G for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:27 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:52270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYC-00057b-VW for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:18 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-986d8332f50so219370066b.0 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434590; x=1693039390; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZxEpccG6/MtVGRnjPlrAfLjJwaMIoozjkRqVe4fUFhE=; b=n8I/3EypevIAoGGPxolSMEPknpUrM29MAOwZkX2KD+nkH+Agwbem+owwsHcSKpA0SS VA0dWDw3t8GaQUDjxrbrIkYD1eOveyAOG+y+owT24BNdrLoPUO8nIPP8UdgWv8G15B6T lIn+wMD1nMRp/DfRGtI5etdC5NYsiad1ZM7vFpA5nl7w91b0m+tE3E6UvLSZqU7AQQj4 0wbn8rjRZ/Z3uCPq4tn6P9bx0Zo/Hf5O0ylsCYqZsO5/Kxvl46eo8cBUz8Noxz/8HDrW cZ1kack8PpUXeseWvfZABNU5R6sV/4TEgK3J9UMzLpoSIYpHoN4/KjE8/3+jAiV0ULR/ 5e6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434590; x=1693039390; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZxEpccG6/MtVGRnjPlrAfLjJwaMIoozjkRqVe4fUFhE=; b=TtEsjs3g1ANnisQ9JB7/SN53V0YsdNoxENFEY04uNU5GymRsGa1M3UGmzHp87RwJmq YSX8ckSj/cdb3yg2brSBPVyIuIBSCSQA9VHYbErBPVVatIGJQk5UQscUoyLbExtjCNnP 8bqGk2jgBwlu76cu1/zCdD+T6+ddPq3Q/FThOzf4Uj8+Qrq18AlLYMvxipF/BL8XC/eZ +5t1JhyPdKNBFlcraYnTRonZc12PyFlVZ9Z8P8LLW9z4mnF6UDJ9MmqiDZCrKcY+DYxs IDVFHIRI1TTJ2iVAGhb8KO+l68A9jOzjc7vS9qqvL2peIZEws1AYFQQEzHU+O2bKDeLR 7vWA== X-Gm-Message-State: AOJu0YzLgJdUneNaDoDvDMIJqQdmsdUzBrsmZHxmxBPyCkko0ZEhIB88 ZsM4kAPprG9+UDDcgSC4rCfORObhfK6usg== X-Google-Smtp-Source: AGHT+IEgSNdQu2K+yxOhciASyF7gPcTDzUVIj6Stof9Fvz431/iSXPciZmqyKy4x/z9X+Aqa5lVn2A== X-Received: by 2002:a17:907:60c7:b0:99c:da06:bca with SMTP id hv7-20020a17090760c700b0099cda060bcamr1071752ejc.4.1692434590351; Sat, 19 Aug 2023 01:43:10 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.09 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:09 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 08:40:03 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-yasnippet)[source]: Use it here. * gnu/packages/patches/emacs-yasnippet-fix-tests.patch: Also fix delete-numberless-inner-snippet-issue-562. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 3 +- ...acs-yasnippet-fix-empty-snippet-next.patch | 59 +++++++++++++++++++ .../patches/emacs-yasnippet-fix-tests.patch | 14 +++++ 4 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch diff --git a/gnu/local.mk b/gnu/local.mk index fb58b4eac8..bdaa9935b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1107,6 +1107,7 @@ 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/emacs-yasnippet-fix-tests.patch \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 89ce0fa900..811728d170 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17117,7 +17117,8 @@ (define-public emacs-yasnippet (sha256 (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv")) (patches - (search-patches "emacs-yasnippet-fix-tests.patch")))) + (search-patches "emacs-yasnippet-fix-empty-snippet-next.patch" + "emacs-yasnippet-fix-tests.patch")))) (build-system emacs-build-system) (arguments `(#:tests? #t diff --git a/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch b/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch new file mode 100644 index 0000000000..1faea2b456 --- /dev/null +++ b/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch @@ -0,0 +1,59 @@ +From 925292484162bc35c4258e72c36462bb13a5c69a Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler +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 + diff --git a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch index c70cc75d92..5995b0afa4 100644 --- a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch +++ b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch @@ -10,6 +10,11 @@ Content-Transfer-Encoding: 8bit - A test that was temporarily broken passes again. - The default for ‘org-adapt-indentation’ has changed. - buffer-list may be called with arguments when native-comp is enabled. + +2023-08-19 Liliana Marie Prikler + + * delete-numberless-inner-snippet-issue-562: Correct value in + looking-at. --- yasnippet-tests.el | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) @@ -26,6 +31,15 @@ index f7ca2bb..7618ab7 100644 ;; Author: João Távora ;; Keywords: emulations, convenience +@@ -289,7 +289,7 @@ attention to case differences." + (should (looking-at "testblable")) + (ert-simulate-command '(yas-next-field-or-maybe-expand)) + (ert-simulate-command '(yas-skip-and-clear-field)) +- (should (looking-at "ble")) ++ (should (looking-at "blable")) + (should (null (yas-active-snippets))))) + + (ert-deftest delete-nested-simple-field-issue-824 () @@ -556,16 +556,19 @@ XXXXX ------------------------")))) (yas-mock-insert "foo bar") (ert-simulate-command '(yas-next-field))