diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index 12dd60434cd..9f23bd126a2 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -58,7 +58,7 @@ (defun url-future-finish (url-future &optional status) (if (url-future-done-p url-future) - (signal 'error 'url-future-already-done) + (signal 'error '(url-future-already-done)) (setf (url-future-status url-future) (or status t)) ;; the status must be such that the future was completed ;; to run the callback @@ -69,7 +69,7 @@ (defun url-future-errored (url-future errorcons) (if (url-future-done-p url-future) - (signal 'error 'url-future-already-done) + (signal 'error '(url-future-already-done)) (setf (url-future-status url-future) 'error) (setf (url-future-value url-future) errorcons) (funcall (or (url-future-errorback url-future) 'ignore) @@ -77,7 +77,7 @@ (defun url-future-call (url-future) (if (url-future-done-p url-future) - (signal 'error 'url-future-already-done) + (signal 'error '(url-future-already-done)) (let ((ff (url-future-value url-future))) (when (functionp ff) (condition-case catcher @@ -93,7 +93,7 @@ (defun url-future-cancel (url-future) (if (url-future-done-p url-future) - (signal 'error 'url-future-already-done) + (signal 'error '(url-future-already-done)) (url-future-finish url-future 'cancel))) (define-obsolete-function-alias 'url-future-cancelled-p diff --git a/src/print.c b/src/print.c index 17e271967cb..ef09b5fbc38 100644 --- a/src/print.c +++ b/src/print.c @@ -708,7 +708,7 @@ print_bind_overrides (Lisp_Object overrides) if (EQ (overrides, Qt)) print_bind_all_defaults (); else if (!CONSP (overrides)) - xsignal (Qwrong_type_argument, Qconsp); + xsignal2 (Qwrong_type_argument, Qconsp, overrides); else { while (!NILP (overrides)) @@ -717,7 +717,7 @@ print_bind_overrides (Lisp_Object overrides) if (EQ (setting, Qt)) print_bind_all_defaults (); else if (!CONSP (setting)) - xsignal (Qwrong_type_argument, Qconsp); + xsignal2 (Qwrong_type_argument, Qconsp, setting); else { Lisp_Object key = XCAR (setting), @@ -729,7 +729,7 @@ print_bind_overrides (Lisp_Object overrides) } if (!NILP (XCDR (overrides)) && !CONSP (XCDR (overrides))) - xsignal (Qwrong_type_argument, Qconsp); + xsignal2 (Qwrong_type_argument, Qconsp, overrides); overrides = XCDR (overrides); } } diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el index 14cfff99c59..e6b2a0eb078 100644 --- a/test/lisp/files-tests.el +++ b/test/lisp/files-tests.el @@ -1892,7 +1892,7 @@ Ensure that the issues from bug#66546 are fixed." (error err)) 'missing)) (signal-write-failed (&rest _) - (signal 'file-error "Write failed"))) + (signal 'file-error '("Write failed")))) (let* (;; Sanitize environment. ;; The tests below test text for equality, so we need to 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)