Fix `signal` calls where the data argument is not a list

* test/src/thread-tests.el (threads-join-error):
* test/src/emacs-module-resources/mod-test.c (Fmod_test_signal):
* src/print.c (print_bind_overrides):
* lisp/url/url-future.el (url-future-finish, url-future-errored)
(url-future-call, url-future-cancel): Make sure signal's data is a list.

* test/src/emacs-module-tests.el (mod-test-non-local-exit-signal-test):
Adjust accordingly.

3 files changed, 11 insertions, 5 deletions

diff --git a/test/src/emacs-module-resources/mod-test.c b/test/src/emacs-module-resources/mod-test.c
index d44af0e4d81..a5aeda0a666 100644
--- a/test/src/emacs-module-resources/mod-test.c
+++ b/test/src/emacs-module-resources/mod-test.c
@@ -114,8 +114,14 @@ Fmod_test_signal (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
                   void *data)
 {
   assert (env->non_local_exit_check (env) == emacs_funcall_exit_return);
-  env->non_local_exit_signal (env, env->intern (env, "error"),
-                              env->make_integer (env, 56));
+  emacs_value cargs[2] = {
+      env->make_integer (env, 56),
+      env->intern (env, "nil")
+    };
+  env->non_local_exit_signal (
+      env, env->intern (env, "error"),
+      env->funcall (env, env->intern (env, "cons"),
+                    2, cargs));
   return NULL;
 }
 
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index e34db70feb6..d2ec127f878 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -121,7 +121,7 @@ changes."
                    (setq handler-err err
                          backtrace (with-output-to-string (backtrace))))))
        (mod-test-signal)))
-    (should (equal handler-err '(error . 56)))
+    (should (equal handler-err '(error 56)))
     (should (string-match-p
              (rx bol "  mod-test-signal()" eol)
              backtrace))))
diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el
index 9cbe1f3a1aa..c575f13b488 100644
--- a/test/src/thread-tests.el
+++ b/test/src/thread-tests.el
@@ -122,10 +122,10 @@
   (skip-unless (featurep 'threads))
   (let ((thread (make-thread #'threads-thread-sleeps))
         err)
-    (thread-signal thread 'error "Error signal for thread")
+    (thread-signal thread 'error '("Error signal for thread"))
     (thread-yield)
     (setq err (should-error (thread-join thread)))
-    (should (equal err '(error . "Error signal for thread")))))
+    (should (equal err '(error "Error signal for thread")))))
 
 (defvar threads-test-binding nil)