diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-02-04 14:39:02 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-02-04 14:39:02 -0500 |
| commit | b2d350cfc0bf8f0e3198bffcebe60a43341fb340 (patch) | |
| tree | 053e32f2b6462a1ebe906c97d7267c8633bb4aaa /lisp/emacs-lisp/comp.el | |
| parent | 7d3c3cad9392d3f8e59f85522053c249aff062e5 (diff) | |
| download | emacs-b2d350cfc0bf8f0e3198bffcebe60a43341fb340.tar.gz emacs-b2d350cfc0bf8f0e3198bffcebe60a43341fb340.tar.bz2 emacs-b2d350cfc0bf8f0e3198bffcebe60a43341fb340.zip | |
* lisp/emacs-lisp/comp.el (comp--native-compile): Use `error-message-string`
Diffstat (limited to 'lisp/emacs-lisp/comp.el')
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 2a516246ed4..dcdc973e6c5 100644 --- 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 |