diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/patches/emacs-helpful-fix-docstring-test.patch | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
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) |