* lisp/emacs-lisp/comp.el (comp--native-compile): Use `error-message-string`

(cherry picked from commit b2d350cfc0bf8f0e3198bffcebe60a43341fb340)

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 2a516246ed463bb8f6af87815f4737b4af0632e6..dcdc973e6c5bf196ddd445fd73938a56a45073b6 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -3398,16 +3398,18 @@ the deferred compilation mechanism."
                    (if (and comp-async-compilation
                             (not (eq (car err) 'native-compiler-error)))
                        (progn
-                         (message (if err-val
-                                      "%s: Error: %s %s"
-                                    "%s: Error %s")
+                         (message "%s: Error %s"
                                   function-or-file
-                                  (get (car err) 'error-message)
-                                  (car-safe err-val))
+                                  (error-message-string err))
                          (kill-emacs -1))
                      ;; Otherwise re-signal it adding the compilation input.
+                     ;; FIXME: We can't just insert arbitrary info in the
+                     ;; error-data part of an error: the handler may expect
+                     ;; specific data at specific positions!
                     (signal (car err) (if (consp err-val)
                                           (cons function-or-file err-val)
+                                        ;; FIXME: `err-val' is supposed to be
+                                        ;; a list, so it can only be nil here!
                                         (list function-or-file err-val)))))))
               (if (stringp function-or-file)
                   data