From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 57086@debbugs.gnu.org
Subject: [bug#57086] [PATCH v3 7/7] gnu: emacs-yasnippet: Fix build.
Date: Wed, 24 Aug 2022 23:59:07 +0200 [thread overview]
Message-ID: <b66f8cd47de9fbcd29c362bd0e623879f9d3d377.camel@gmail.com> (raw)
In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3815 bytes --]
* 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
next prev parent reply other threads:[~2022-08-25 7:26 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 13:07 bug#55657: libgccjit is unusable Liliana Marie Prikler
2022-06-04 14:07 ` Remco van 't Veer
2022-06-04 14:22 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2022-06-04 14:25 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2022-06-04 15:14 ` Liliana Marie Prikler
2022-06-28 0:53 ` John Kehayias via Bug reports for GNU Guix
2022-06-28 4:17 ` Liliana Marie Prikler
2022-06-28 5:16 ` John Kehayias via Bug reports for GNU Guix
2022-08-03 21:13 ` John Kehayias via Bug reports for GNU Guix
2022-08-04 4:26 ` Liliana Marie Prikler
2022-08-04 4:48 ` Andrew Whatson
2022-08-04 16:52 ` Liliana Marie Prikler
2022-08-05 0:59 ` Andrew Whatson
2022-08-05 18:44 ` Liliana Marie Prikler
2022-08-05 20:01 ` John Kehayias via Bug reports for GNU Guix
2022-08-05 21:31 ` Liliana Marie Prikler
2022-08-06 5:37 ` John Kehayias via Bug reports for GNU Guix
2022-08-06 5:53 ` Liliana Marie Prikler
2022-08-07 3:19 ` John Kehayias via Bug reports for GNU Guix
2022-08-07 13:59 ` Liliana Marie Prikler
2022-08-07 15:09 ` John Kehayias via Bug reports for GNU Guix
2022-08-07 15:41 ` Liliana Marie Prikler
2022-08-09 20:44 ` John Kehayias via Bug reports for GNU Guix
2022-08-09 23:53 ` Andrew Whatson
2022-08-09 18:37 ` bug#55657: [PATCH 0/6] Add native compilation to Emacs Liliana Marie Prikler
2022-08-05 3:29 ` [bug#57086] [PATCH 1/6] gnu: Parameterize libgccjit Liliana Marie Prikler
2022-08-05 3:29 ` [bug#57086] [PATCH v3 1/7] " Liliana Marie Prikler
2022-08-05 18:27 ` [bug#57086] [PATCH v3 2/7] gnu: libgccjit: Build with bootstrapped gcc Liliana Marie Prikler
2022-08-05 18:27 ` [bug#57086] [PATCH 2/6] " Liliana Marie Prikler
2022-08-05 18:30 ` [bug#57086] [PATCH v3 3/7] gnu: libgccjit: Build multiple versions Liliana Marie Prikler
2022-08-05 18:30 ` [bug#57086] [PATCH 3/6] " Liliana Marie Prikler
2022-08-05 22:37 ` [bug#57086] [PATCH v3 4/7] gnu: emacs: Build with native compilation Liliana Marie Prikler
2022-08-05 22:37 ` [bug#57086] [PATCH 4/6] " Liliana Marie Prikler
2022-08-09 18:26 ` [bug#57086] [PATCH v3 5/7] guix: emacs-utils: Add emacs-compile-directory Liliana Marie Prikler
2022-08-09 18:26 ` [bug#57086] [PATCH 5/6] " Liliana Marie Prikler
2022-08-09 18:26 ` [bug#57086] [PATCH v2 " Liliana Marie Prikler
2022-08-09 18:32 ` [bug#57086] [PATCH v3 6/7] build-system: emacs: Use native compilation Liliana Marie Prikler
2022-08-09 18:32 ` [bug#57086] [PATCH 6/6] " Liliana Marie Prikler
2022-08-09 21:19 ` [bug#57086] [PATCH 0/6] Add native compilation to Emacs ( via Guix-patches via
2022-08-10 4:19 ` Liliana Marie Prikler
2022-08-10 6:11 ` ( via Guix-patches via
2022-08-23 20:07 ` Liliana Marie Prikler
2022-08-24 21:59 ` Liliana Marie Prikler [this message]
2022-08-25 7:08 ` [bug#57086] [PATCH v3 0/7] " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b66f8cd47de9fbcd29c362bd0e623879f9d3d377.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=57086@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.