From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 25 03:24:52 2022 Received: (at 57086) by debbugs.gnu.org; 25 Aug 2022 07:24:52 +0000 Received: from localhost ([127.0.0.1]:48757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR7ES-0000AI-FD for submit@debbugs.gnu.org; Thu, 25 Aug 2022 03:24:52 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:36826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR7EG-00008q-6w for 57086@debbugs.gnu.org; Thu, 25 Aug 2022 03:24:40 -0400 Received: by mail-ed1-f67.google.com with SMTP id w10so12787496edc.3 for <57086@debbugs.gnu.org>; Thu, 25 Aug 2022 00:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc; bh=9yqhx642D+VQVo3b8vb9UwzIzEzos5Ps67m76WMlY+o=; b=mX4Di95wX2Gg33L8aS6PBsmKSobEsxbIL58bNpKw9H/mfct7hg/J9QBb8n2ZCrcNgg HLPWd4UVSNo4b6v+Co4otMi2WAuuVAstX1kip4MaOUOaC5rr1BxXCkbQu1a3HWrErwZc tL0swoHLleur/46W9FAITDGoiXH44RlYK8xXMRHxEAv+ASnckK3lRdCzuq+JS7WYEL2E iiMCsNp28Rc/gRXrKEqtnyarEdznOA63/Nrysbw0JaTlQQdGgwptQ4Uqr5XKeLIjmU3l BMEO/VPK+MF8ktDqLbeFL29mJkDCEq3EQblMMHiP9gndQycfHoHjAsogiRzW2/fiJU2I roDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc; bh=9yqhx642D+VQVo3b8vb9UwzIzEzos5Ps67m76WMlY+o=; b=uTmvdVlPAckXQkgaEBwZgtE+vJeFKH0Eq9BwtAkL5ZY6Vk20JRC8Ef/QqAwnttITY2 cr5JtFGXk1wtRBuGZ3cgTLO0Yq3YmSFbqfrTGfebGMGSo0zM/CG/nnZe9AfmyZ9UR0gq NV5dDzS0K2AZhkZR4lvEAOTVgHyDW4a8GuWuER/MgGpAm1JxI7yG1fT0Nh0NiEDznviO H0k6+yLFRFnh7MU/Yf/gaTeBW2AGCU05zo8lVdG+nIBCmKeJ7Ezs+O1PFsi5VIP7ZjId qXuzQ7UbXCImc+dZNBWyfkJ4LbAUwx6C6B0R8Ya7QFiHWdkzCAUI5gndjNENvPn7tjfD oqQA== X-Gm-Message-State: ACgBeo1HQiBYPtEVdH1gtPJ+2zz9nL+OhonWJmHeHidmUx3cG4GykHV5 NeVLBAqfUEeLePw7nuuUn0TQP8Q74jg= X-Google-Smtp-Source: AA6agR5hVSpiWq8kGw4FXkItW5vKT/WA3Ba6wBf7O2cF66YBpbpir0xOyB5taPpItLaIdtLq6+baJg== X-Received: by 2002:a05:6402:14e:b0:443:f58:17e9 with SMTP id s14-20020a056402014e00b004430f5817e9mr2148265edu.106.1661412274530; Thu, 25 Aug 2022 00:24:34 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g2-20020a170906538200b0073d62cc3270sm2019690ejo.118.2022.08.25.00.24.33 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 00:24:33 -0700 (PDT) From: Liliana Marie Prikler Date: Wed, 24 Aug 2022 23:59:07 +0200 Subject: [PATCH v3 7/7] gnu: emacs-yasnippet: Fix build. to: 57086@debbugs.gnu.org Content-Transfer-Encoding: 8bit Message-ID: MIME-Version: 1.0 X-Spam-Score: 1.4 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-yasnippet-fix-tests.patch: Handle arguments in buffer-list. --- .../patches/emacs-yasnippet-fix-tests.patch | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 de [...] Content analysis details: (1.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.67 listed in wl.mailspike.net] 0.3 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 57086 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.4 (/) * gnu/packages/patches/emacs-yasnippet-fix-tests.patch: Handle arguments in buffer-list. --- .../patches/emacs-yasnippet-fix-tests.patch | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch index 475352d8db..c70cc75d92 100644 --- a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch +++ b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch @@ -9,12 +9,13 @@ Content-Transfer-Encoding: 8bit - Emacs 28 has a new mode ‘lisp-data-mode’ for Lisp data. - 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. --- - yasnippet-tests.el | 41 ++++++++++++++++++++++++++--------------- - 1 file changed, 26 insertions(+), 15 deletions(-) + yasnippet-tests.el | 45 ++++++++++++++++++++++++++++----------------- + 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/yasnippet-tests.el b/yasnippet-tests.el -index b8a7980f..9fadf00c 100644 +index f7ca2bb..7618ab7 100644 --- a/yasnippet-tests.el +++ b/yasnippet-tests.el @@ -1,6 +1,6 @@ @@ -55,7 +56,21 @@ index b8a7980f..9fadf00c 100644 ;; Some org-mode versions leave trailing whitespace, some don't. (delete-trailing-whitespace) (should (equal expected (buffer-string)))))) -@@ -1390,7 +1393,9 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ +@@ -1195,11 +1198,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ + (let ((saved-sym (make-symbol "yas--buffer-list"))) + `(let ((,saved-sym (symbol-function 'buffer-list))) + (cl-letf (((symbol-function 'buffer-list) +- (lambda () ++ (lambda (&rest args) + (cl-remove-if (lambda (buf) + (with-current-buffer buf + (eq major-mode 'lisp-interaction-mode))) +- (funcall ,saved-sym))))) ++ (funcall ,saved-sym args))))) + ,@body)))) + + +@@ -1356,7 +1359,9 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ ,@(if (fboundp 'prog-mode) '(prog-mode)) emacs-lisp-mode @@ -66,7 +81,7 @@ index b8a7980f..9fadf00c 100644 (observed (yas--modes-to-activate))) (should (equal major-mode (car observed))) (should (equal (sort expected #'string<) (sort observed #'string<)))))))) -@@ -1418,7 +1423,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ +@@ -1384,7 +1389,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ '(prog-mode)) emacs-lisp-mode and-also-this-one @@ -79,7 +94,7 @@ index b8a7980f..9fadf00c 100644 (observed (yas--modes-to-activate))) (should (equal expected-first (cl-subseq observed 0 (length expected-first)))) -@@ -1691,9 +1700,11 @@ TODO: be meaner" +@@ -1657,9 +1666,11 @@ TODO: be meaner" "Test expansion of snippets in org source blocks." ;; org 9+ no longer runs fontification for text-mode, so our hacks ;; don't work. Note that old ert doesn't have skipping, so we have @@ -93,3 +108,6 @@ index b8a7980f..9fadf00c 100644 :passed :failed) (let ((text-mode-hook #'yas-minor-mode)) (do-yas-org-native-tab-in-source-block "text"))) +-- +2.37.2 + -- 2.37.2