WiPscratch/error-API

4 files changed, 8 insertions, 24 deletions

diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 2d0ab0fdeaf..466b76d2bb3 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1936,10 +1936,10 @@ COLLAPSE non-nil means collapse the branch."
 Don't let it move into the title lines.
 See `Electric-command-loop' for a description of STATE and CONDITION."
   (cond ((and condition
-              (not (memq (car condition)
-                         '(buffer-read-only end-of-buffer
-                                            beginning-of-buffer))))
-         (signal (car condition) (cdr condition)))
+              (not (or (error-has-type-p condition 'buffer-read-only)
+                       (error-has-type-p condition 'end-of-buffer)
+                       (error-has-type-p condition 'beginning-of-buffer))))
+         (signal condition))
         ((< (point) (car state))
          (goto-char (point-min))
          (forward-line 2))
@@ -3879,23 +3879,7 @@ Runs the hook `ebrowse-electric-position-mode-hook'."
     (kill-buffer buffer)))
 
 
-(defun ebrowse-electric-position-looper (state condition)
-  "Prevent moving point on invalid lines.
-Called from `Electric-command-loop'.  See there for the meaning
-of STATE and CONDITION."
-  (cond ((and condition
-              (not (memq (car condition) '(buffer-read-only
-                                           end-of-buffer
-                                           beginning-of-buffer))))
-         (signal (car condition) (cdr condition)))
-        ((< (point) (car state))
-         (goto-char (point-min))
-         (forward-line 2))
-        ((> (point) (cdr state))
-         (goto-char (point-max))
-         (forward-line -1)
-         (if (pos-visible-in-window-p (point-max))
-             (recenter -1)))))
+(defalias 'ebrowse-electric-position-looper #'ebrowse-electric-list-looper)
 
 
 (defun ebrowse-electric-position-undefined ()
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index a4f076a6197..b0de857c4d2 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2874,7 +2874,7 @@ THINGS are either registrations or unregisterations (sic)."
                     (if (cdr oops) (format " (%s)" (cdr oops)) "")))))
     (t
      ;; resignal (unfortunately like this)
-     (signal (car oops) (cdr oops)))))
+     (signal oops))))
 
 (cl-defmethod eglot-handle-request
   (server (_method (eql workspace/workspaceFolders)))
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 44c54a60757..a5e1d8ac023 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -849,7 +849,7 @@ macro as normal text."
       (search-failed
        (goto-char saved-point)
        (unless noerror
-         (signal (car err) (cdr err)))))))
+         (signal err))))))
 
 
 (defun js--re-search-backward-inner (regexp &optional bound count)
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index d5e1dc39790..18800e29aa5 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -995,7 +995,7 @@ directory and makes this the current buffer's default directory."
       (progn
         (cd (car inferior-octave-output-list))
         t)
-    (error (unless noerror (signal (car err) (cdr err))))))
+    (error (unless noerror (signal err)))))
 
 (defcustom inferior-octave-minimal-columns 80
   "The minimal column width for the inferior Octave process."