4 files changed, 16 insertions, 42 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e2d73804eb5..aadfc4c335a 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -4966,9 +4966,9 @@ binding slots have been popped."
           (unless (and c (symbolp c))
             (byte-compile-warn-x
              c "`%S' is not a condition name (in condition-case)" c))
-          ;; In reality, the `error-conditions' property is only required
+          ;; In reality, the `error-conditions' property is required only
           ;; for the argument to `signal', not to `condition-case'.
-          ;;(unless (consp (get c 'error-conditions))
+          ;;(unless (error-type-p c)
           ;;  (byte-compile-warn
           ;;   "`%s' is not a known condition name (in condition-case)"
           ;;   c))
@@ -5778,24 +5778,13 @@ already up-to-date."
         (byte-compile-file file)
       (condition-case err
           (byte-compile-file file)
-        (file-error
-         (message (if (cdr err)
-                      ">>Error occurred processing %s: %s (%s)"
-                    ">>Error occurred processing %s: %s")
-                  file
-                  (get (car err) 'error-message)
-                  (prin1-to-string (cdr err)))
-         (let ((destfile (byte-compile-dest-file file)))
-           (if (file-exists-p destfile)
-               (delete-file destfile)))
-         nil)
         (error
-         (message (if (cdr err)
-                      ">>Error occurred processing %s: %s (%s)"
-                    ">>Error occurred processing %s: %s")
-                  file
-                  (get (car err) 'error-message)
-                  (prin1-to-string (cdr err)))
+         (message ">>Error occurred processing %s: %s"
+                  file (error-message-string err))
+         (when (error-has-type-p err 'file-error)
+           (let ((destfile (byte-compile-dest-file file)))
+             (if (file-exists-p destfile)
+                 (delete-file destfile))))
          nil)))))
 
 (defun byte-compile-refresh-preloaded ()
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index bcea708c678..3019ada1bbd 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -560,9 +560,7 @@ The environment used is the one when entering the activation frame at point."
                     (condition-case err
                         (backtrace-eval exp nframe base)
                       (error (setq errored
-                                   (format "%s: %s"
-                                           (get (car err) 'error-message)
-                                           (car (cdr err)))))))))
+                                   (error-message-string err)))))))
         (if errored
             (progn
               (message "Error: %s" errored)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 5cb781cb39f..3bb12e18842 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3745,9 +3745,7 @@ Return the result of the last expression."
   ;; If there is an error, a string is returned describing the error.
   (condition-case edebug-err
       (edebug-eval expr)
-    (error (edebug-format "%s: %s"  ;; could
-                          (get (car edebug-err) 'error-message)
-                          (car (cdr edebug-err))))))
+    (error (error-message-string edebug-err))))
 
 ;;; Printing
 
@@ -3755,14 +3753,7 @@ Return the result of the last expression."
 (defun edebug-report-error (value)
   ;; Print an error message like command level does.
   ;; This also prints the error name if it has no error-message.
-  (message "%s: %s"
-           (or (get (car value) 'error-message)
-               (format "peculiar error (%s)" (car value)))
-           (mapconcat (lambda (edebug-arg)
-                        ;; continuing after an error may
-                        ;; complain about edebug-arg. why??
-                        (prin1-to-string edebug-arg))
-                      (cdr value) ", ")))
+  (message "%s" (error-message-string value)))
 
 ;; Alternatively, we could change the definition of
 ;; edebug-safe-prin1-to-string to only use these if defined.
@@ -3812,10 +3803,7 @@ this is the prefix key.)"
              (condition-case err
                  (edebug-eval expr)
                (error
-                (setq errored
-                      (format "%s: %s"
-                              (get (car err) 'error-message)
-                              (car (cdr err)))))))))
+                (setq errored (error-message-string err)))))))
          (result
           (unless errored
             (values--store-value value)
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index d5e0afe3b92..6dacd568c7a 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -396,12 +396,11 @@ Returns nil."
 
 Determines whether CONDITION matches TYPE and EXCLUDE-SUBTYPES,
 and aborts the current test as failed if it doesn't."
-  (let ((signaled-conditions (get (car condition) 'error-conditions))
-        (handled-conditions (pcase-exhaustive type
+  (let ((handled-conditions (pcase-exhaustive type
                               ((pred listp) type)
                               ((pred symbolp) (list type)))))
-    (cl-assert signaled-conditions)
-    (unless (cl-intersection signaled-conditions handled-conditions)
+    (unless (cl-some (lambda (hc) (error-has-type-p condition hc))
+                     handled-conditions)
       (ert-fail (append
                  (funcall form-description-fn)
                  (list
@@ -409,7 +408,7 @@ and aborts the current test as failed if it doesn't."
                   :fail-reason (concat "the error signaled did not"
                                        " have the expected type")))))
     (when exclude-subtypes
-      (unless (member (car condition) handled-conditions)
+      (unless (member (error-type condition) handled-conditions)
         (ert-fail (append
                    (funcall form-description-fn)
                    (list