diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/packages/patches/emacs-helpful-fix-docstring-test.patch | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/emacs-helpful-fix-docstring-test.patch')
| -rw-r--r-- | gnu/packages/patches/emacs-helpful-fix-docstring-test.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch b/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch deleted file mode 100644 index de40010fa2..0000000000 --- a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -This patch fixing a build failure has been cherry-picked from upstream. -Originally submitted as pull request by Erik Šabič. -See also <https://github.com/Wilfred/helpful/pull/296>. -diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el -index a07aa8e..8a95129 100644 ---- a/test/helpful-unit-test.el -+++ b/test/helpful-unit-test.el -@@ -119,7 +119,9 @@ bar"))) - (should - (equal - (helpful--docstring #'test-foo-advised t) -- "Docstring here too."))) -+ (if (version< emacs-version "28") -+ "Docstring here too." -+ "Docstring here too.\n\nThis function has :around advice: `ad-Advice-test-foo-advised'.")))) - - (defun test-foo-no-docstring () - nil) |