WiPscratch/error-API

11 files changed, 31 insertions, 29 deletions

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 465de028725..58d78b14c12 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -245,7 +245,7 @@ Otherwise, return result of last form in BODY, or all other errors."
   (declare (indent 0) (debug t))
   `(condition-case err
        (progn ,@body)
-     (dbus-error (when dbus-debug (signal (car err) (cdr err))))))
+     (dbus-error (when dbus-debug (signal err)))))
 
 (defvar dbus-event-error-functions
   '(dbus-notice-synchronous-call-errors
@@ -878,7 +878,7 @@ Example:
          "AddMatch" rule)
       (dbus-error
        (if (not (string-match-p "eavesdrop" rule))
-           (signal (car err) (cdr err))
+           (signal err)
          ;; The D-Bus spec says we shall fall back to a rule without eavesdrop.
          (when dbus-debug (message "Removing eavesdrop from rule %s" rule))
          (setq rule (replace-regexp-in-string ",eavesdrop='true'" "" rule t t))
@@ -1234,7 +1234,7 @@ If the HANDLER returns a `dbus-error', it is propagated as return message."
      ;; Propagate D-Bus error messages.
      (run-hook-with-args 'dbus-event-error-functions event err)
      (when dbus-debug
-       (signal (car err) (cdr err))))))
+       (signal err)))))
 
 (defun dbus-event-bus-name (event)
   "Return the bus name the event is coming from.
@@ -1668,7 +1668,7 @@ return nil.
     (dbus-error
      (if (string-equal dbus-error-access-denied (cadr err))
          (car args)
-       (signal (car err) (cdr err))))))
+       (signal err)))))
 
 (defun dbus-get-all-properties (bus service path interface)
   "Return all properties of INTERFACE at BUS, SERVICE, PATH.
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index aa8e52bd792..ac212e7a817 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -187,11 +187,11 @@ LOCATION is used as the phone location for BBDB."
                                (bbdb-parse-phone phone)
                              (bbdb-parse-phone-number phone)))
         (error
-         (if (string= "phone number unparsable." (cadr err))
+         (if (equal "phone number unparsable." (error-slot-value err 1))
              (if (not (y-or-n-p (format "BBDB claims %S to be unparsable--insert anyway? " phone)))
                  (error "Phone number unparsable")
                (setq phone-list (list (bbdb-string-trim phone))))
-           (signal (car err) (cdr err)))))
+           (signal err))))
       (if (= 3 (length phone-list))
           (setq phone-list (append phone-list '(nil))))
       (apply #'vector location phone-list)))
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 22bebbb0f0c..bb298d11d3c 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -1729,11 +1729,11 @@ See `imap-enable-exchange-bug-workaround'."
               ;; robust just to check for a BAD response to the
               ;; attempted fetch.
               (string-match "The specified message set is invalid"
-                            (cadr data)))
+                            (error-slot-value data 1)))
          (with-current-buffer (or buffer (current-buffer))
            (setq-local imap-enable-exchange-bug-workaround t)
            (imap-fetch (cdr uids) props receive nouidfetch))
-       (signal (car data) (cdr data))))))
+       (signal data)))))
 
 (defun imap-message-copyuid-1 (mailbox)
   (if (imap-capability 'UIDPLUS)
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index f6d2ba229e5..544f0286834 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -3194,7 +3194,7 @@ OPERATION-NAME and PARAMETERS are as described in `soap-invoke'."
                (unwind-protect
                    (let ((error-status (plist-get status :error)))
                      (if error-status
-                         (signal (car error-status) (cdr error-status))
+                         (signal error-status)
                        (apply callback
                               (soap-parse-envelope
                                (soap-parse-server-response)
@@ -3221,7 +3221,7 @@ OPERATION-NAME and PARAMETERS are as described in `soap-invoke'."
              ;; Propagate soap-errors -- they are error replies of the
              ;; SOAP protocol and don't indicate a communication
              ;; problem or a bug in this code.
-             (signal (car err) (cdr err)))
+             (signal err))
             (error
              (when soap-debug
                (pop-to-buffer buffer))
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index c20b5df9b59..0184586ba0e 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -629,7 +629,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
                       (rename-file tmpfile newname ok-if-already-exists)
                     ((error quit)
                      (delete-file tmpfile)
-                     (signal (car err) (cdr err))))
+                     ;; FIXME: Maybe `unwind-protect' would be better.
+                     (signal err)))
 
                 ;; Remote newname.
                 (when (and (file-directory-p newname)
diff --git a/lisp/net/tramp-androidsu.el b/lisp/net/tramp-androidsu.el
index f15c5587651..320163c55d5 100644
--- a/lisp/net/tramp-androidsu.el
+++ b/lisp/net/tramp-androidsu.el
@@ -227,7 +227,7 @@ multibyte mode and waits for the shell prompt to appear."
         ;; Cleanup, and propagate the signal.
         ((error quit)
          (tramp-cleanup-connection vec t)
-         (signal (car err) (cdr err)))))))
+         (signal err))))))
 
 (defun tramp-androidsu-generate-wrapper (function)
   "Return connection wrapper function for FUNCTION.
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index ecc6fe96855..c42c69af9a5 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -263,7 +263,7 @@ value is the default binding of the variable."
 ;; * Starting with Emacs 30.1, there is `handler-bind'.  Use it
 ;;   instead of `condition-case' when the origin of an error shall be
 ;;   kept, for example when the HANDLER propagates the error with
-;;   `(signal (car err) (cdr err)'.
+;;   `(signal err)'.
 ;;
 ;; * Starting with Emacs 30.1, use '(_ VALUEFORM)' instead of
 ;;   '(VALUEFORM)' in 'if-let*/when-let*/and-let*'.
diff --git a/lisp/net/tramp-crypt.el b/lisp/net/tramp-crypt.el
index 59e4cea2edb..fa609ae6e15 100644
--- a/lisp/net/tramp-crypt.el
+++ b/lisp/net/tramp-crypt.el
@@ -572,7 +572,7 @@ localname."
          (setcar
           (cdr err)
           (replace-regexp-in-string encrypt-regexp filename (cadr err))))
-       (signal (car err) (cdr err))))))
+       (signal err)))))
 
 (defun tramp-crypt-do-copy-or-rename-file
   (op filename newname &optional ok-if-already-exists keep-date
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index c83a7a9978d..e7e5a142b9d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3468,9 +3468,10 @@ will be used."
                    "Wrong method specification for `%s'" method)))
 
             ;; Error handling.
+            ;; FIXME: Use `unwind-protect'?
             ((error quit)
              (delete-file tmpfile)
-             (signal (car err) (cdr err)))))
+             (signal err))))
 
       ;; Impossible to copy.  Trigger `file-missing' error.
       (delete-file tmpfile)
@@ -3526,10 +3527,11 @@ will be used."
                 create-lockfiles)
             (condition-case err
                 (write-region start end tmpfile append 'no-message)
+              ;; FIXME: Use `unwind-protect'?
               ((error quit)
                (setq tramp-temp-buffer-file-name nil)
                (delete-file tmpfile)
-               (signal (car err) (cdr err)))))
+               (signal err))))
 
           ;; Now, `last-coding-system-used' has the right value.
           ;; Remember it.
@@ -3567,10 +3569,10 @@ will be used."
                         ;; We keep the local file for performance
                         ;; reasons, useful for "rsync".
                         (copy-file tmpfile filename t)
-                      ((error quit)
+                      ((error quit)     ;FIXME: `unwind-protect'?
                        (setq tramp-temp-buffer-file-name nil)
                        (delete-file tmpfile)
-                       (signal (car err) (cdr err)))))
+                       (signal err))))
                 (setq tramp-temp-buffer-file-name nil)
                 ;; Don't rename, in order to keep context in SELinux.
                 (unwind-protect
@@ -5521,9 +5523,10 @@ connection if a previous connection has died for some reason."
                 (tramp-set-connection-property p "connected" t))))
 
         ;; Cleanup, and propagate the signal.
+        ;; FIXME: `unwind-protect'?
         ((error quit)
          (tramp-cleanup-connection vec t)
-         (signal (car err) (cdr err)))))))
+         (signal err))))))
 
 (defun tramp-send-command (vec command &optional neveropen nooutput)
   "Send the COMMAND to connection VEC.
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 554aa354c00..8985f751bb1 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -610,11 +610,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
                      (and (tramp-tramp-file-p filename)
                           (file-local-copy filename))))
               ;; Remote filename.
-              (condition-case err
+              (unwind-protect
                   (rename-file tmpfile newname ok-if-already-exists)
-                ((error quit)
-                 (delete-file tmpfile)
-                 (signal (car err) (cdr err))))
+                (delete-file tmpfile))
 
             ;; Remote newname.
             (when (and (file-directory-p newname)
@@ -852,7 +850,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
                     nil                  ;9 gid weird
                     inode                ;10 inode number
                     device))))           ;11 file system number
-        (remote-file-error (signal (car err) (cdr err)))
+        (remote-file-error (signal err))
         (error)))))
 
 (defun tramp-smb-do-file-attributes-with-stat (vec)
@@ -2125,7 +2123,7 @@ If ARGUMENT is non-nil, use it as argument for
                            (tramp-cleanup-connection vec t)
                            (tramp-smb-maybe-open-connection vec argument))
                        ;; Propagate the error.
-                       (signal (car err) (cdr err))))))))))))))
+                       (signal err)))))))))))))
 
 ;; We don't use timeouts.  If needed, the caller shall wrap around.
 (defun tramp-smb-wait-for-output (vec)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5441a26d7a0..fc607967194 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2153,7 +2153,7 @@ does not exist, otherwise propagate the error."
         (if (not (or (file-exists-p ,filename) (file-symlink-p ,filename)))
             (when (tramp-connectable-p ,vec)
               (tramp-error ,vec 'file-missing ,filename))
-          (signal (car ,err) (cdr ,err)))))))
+          (signal ,err))))))
 
 (defun tramp-signal-hook-function (error-symbol data)
   "Function to be called via `signal-hook-function'.
@@ -4038,7 +4038,7 @@ BODY is the backend specific code."
              (progn ,@body)
            (error (if tramp-inhibit-errors-if-setting-file-attributes-fail
                       (display-warning 'tramp (error-message-string err))
-                    (signal (car err) (cdr err)))))))))
+                    (signal err))))))))
 
 (defmacro tramp-skeleton-write-region
   (start end filename append visit lockname mustbenew &rest body)
@@ -4846,9 +4846,9 @@ existing) are returned."
                (tramp-error v 'file-missing filename)))
             (error
              (add-hook 'find-file-not-found-functions
-                       `(lambda () (signal ',(car err) ',(cdr err)))
+                       (lambda () (signal err))
                        nil t)
-             (signal (car err) (cdr err))))
+             (signal err)))
 
         ;; Save exit.
         (when visit